Currently translated at 100.0% (2899 of 2899 strings)

Currently translated at 100.0% (2899 of 2899 strings)

Currently translated at 100.0% (2877 of 2877 strings)

Currently translated at 98.9% (2844 of 2877 strings)

Currently translated at 98.7% (2841 of 2877 strings)

Master

See merge request !1864

Hotline master

See merge request !1863

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

Conflicts:
	library/Class/Catalogue.php

Hotline master

See merge request !1861

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:
	cosmogramme/sql/patch/patch_311.php
	tests/db/UpgradeDBTest.php

Dev#47780 digital ressources plugins

See merge request !1859

dev #47593 version file

See merge request !1856

Conflicts:
	library/translation/en.po