Nicolas Le Goff 6ba5ce6669 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Root.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	lib/classes/task/databoxAbstract.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/email-template.html.twig

2014-01-24 18:52:14 +01:00

..

cgus.html.twig

Fix twig tags

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

databox.html.twig

Merge branch '3.8'

2014-01-24 18:52:14 +01:00

details.html.twig

Fix twig tags

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