Nicolas Le Goff 15abccf594 Merge branch '3.8' ...

Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php

2014-01-20 11:08:36 +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

Merge branch '3.8'

2013-12-18 12:12:58 +01:00

suggested_value.html.twig

Merge branch '3.8'

2014-01-20 11:08:36 +01:00