Nicolas Le Goff 5e07b68780 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	templates/web/report/ajax_dashboard_content_child.html.twig
	templates/web/report/all_content.html.twig
	templates/web/report/report_layout_child.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Report/RootTest.php

2014-03-23 19:49:12 +01:00

..

DatasUpgraderInterface.php

Bump copyright year

2014-01-06 15:28:12 +01:00

Step31.php

Merge branch '3.8'

2014-03-23 19:49:12 +01:00

Step35.php

Merge branch '3.8'

2014-01-31 14:59:53 +01:00