# Conflicts:
#	VERSIONS
#	library/startup.php
#	library/translation/en.mo
#	library/translation/en.po

Hotline#50177 filter library with commsigb during login

See merge request !1895

hotline #47691 add action right schel in Acl by roles

See merge request !1894

hotline #50042 fix english translation file

See merge request !1892

Dev#49273 2155 inscription a une formation envoi d un mail

See merge request !1893

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_308.php
	library/Class/CodifThesaurus.php
	library/translation/es.mo
	tests/db/UpgradeDBTest.php

Hotline#49992 fix authentification

See merge request !1891

hotline #45756 fix slider behavior

See merge request !1887

hotline #50053 : use soundcloud /resolve service with provided soundclound url

See merge request !1889

Merge branch 'hotline#47280_dispartition_de_la_barre_d_outils_editeur_de_texte_en_modification_d_article_pleine_page' into 'stable'

hotline  #47280 :  syntax error on version file

See merge request !1890

Merge branch 'hotline#47280_dispartition_de_la_barre_d_outils_editeur_de_texte_en_modification_d_article_pleine_page' into 'stable'

hotline #47280 : fix ckeditor full article display when maximize page

See merge request !1888