Conflicts:
	cosmogramme/sql/patch/patch_310.php
	library/startup.php
	tests/db/UpgradeDBTest.php

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.