Skip to content
Snippets Groups Projects
Commit 684c8b6e authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch 'Dev#17629_Domains' into dev_#17514_indexation_paniers_domaines

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/php/integration/domaines.php
	library/Class/NoticeDomain.php
	library/Class/PanierNotice.php
parents 844d3e63 0dcdcef5
Branches
Tags
5 merge requests!715Master,!686Dev#17514 indexation refactoring,!649Dev#19675 improve display articles and sito in kiosque,!630Dev#17514 indexation refactoring,!618Dev #17514 indexation paniers domaines
Showing
with 467 additions and 304 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment