Conflicts:
	tests/application/modules/admin/controllers/CatalogueControllerTest.php

Conflicts:
	library/Class/Catalogue.php

Merge branch 'hotline#49519_valence_les_traitements_cosmogramme_ne_terminent_jamais' into 'hotline-master'

Hotline#49519 valence les traitements cosmogramme ne terminent jamais

See merge request !1854

Conflicts:
	VERSIONS
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_307.php
	library/startup.php
	tests/db/UpgradeDBTest.php

hotline #49000 fix items deletion on total import

See merge request !1850

Conflicts:
	VERSIONS
	library/Class/CodifThesaurus.php
	library/startup.php

48530

See merge request !1848

Merge branch 'hotline#48424_champs_personnalises_articles_cms_inexploitables_en_facettes' into 'stable'

Hotline#48424 champs personnalises articles cms inexploitables en facettes

See merge request !1849

This reverts commit 0e8eaf19.

Conflicts:
	tests/application/modules/admin/controllers/BibControllerTest.php

Hotline master

See merge request !1845

Merge remote-tracking branch 'afi/stable' into afi-hotline-master

Merge branch 'hotline#48424_champs_persoinnalises_articles_cms_inexploitables_en_facettes' into 'stable'

hotline #48424 : always register customfields

registration should be done not only in dispatch but also in CLI context

See merge request !1842

Hotline master

See merge request !1843

registration should be done not only in dispatch but also in CLI context