Romain Neutron 9580ff7585 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/task/period/archive.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/login/layout/base-layout.html.twig

2013-12-09 14:17:03 +01:00

..

collection.html.twig

Merge branch '3.8'

2013-12-09 14:17:03 +01:00

create.html.twig

Locale simplification

2013-12-03 20:05:20 +01:00

details.html.twig

Locale simplification

2013-12-03 20:05:20 +01:00

reorder.html.twig

Fix twig tags

2013-12-03 20:02:39 +01:00

suggested_value.html.twig

Merge branch '3.8'

2013-12-09 14:17:03 +01:00