Nicolas Le Goff b9bb9f5f0e Merge branch '3.8' ...

Conflicts:
	.gitignore
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/databox.php
	lib/classes/task/abstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	lib/conf.d/bases_structure.xml
	templates/web/admin/tasks/list.html.twig

2014-08-26 13:38:01 +02:00

..

Phrasea

Merge branch '3.8'

2014-08-26 13:38:01 +02:00

Tools

Use symfony translator

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