# Conflicts:
#	application/modules/opac/controllers/ModulesController.php
#	library/Class/UserGroup.php
#	library/Class/Users.php
#	tests/bootstrap.php
#	tests/fixtures/RessourcesNumeriquesFixtures.php

# Conflicts:
#	application/modules/opac/controllers/ModulesController.php
#	library/Class/AdminVar.php
#	library/Class/Systeme/ModulesMenu.php
#	library/Class/UserGroup.php
#	library/Class/Users.php
#	tests/application/modules/opac/controllers/ModulesControllerMyCowTest.php
#	tests/application/modules/opac/controllers/ModulesControllerTest.php
#	tests/fixtures/RessourcesNumeriquesFixtures.php
#	tests/library/Class/Systeme/ModulesMenuTest.php

Dev #17872 planet nemo sso cas

See merge request !762

Hotline#19281 article edit date

See merge request !758

forgotten patch

Typo3 import: article uses datetime field for date_maj

Display article creation date in edit page

Article date_maj updated only on manual save

Stable

See merge request !757

Hotline #22214 fnac resume update

See merge request !756

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

# Conflicts:
#	VERSIONS
#	library/ZendAfi/View/Helper/Notice/Unimarc.php
#	library/startup.php

Hotline#21286 holds not deleted with full import

See merge request !750

Hotline#20851 facebook share output html

See merge request !754

add version file

Sandbox#16325 inspector gadget record items

See merge request !752

Notify consultBook errors