Files
Phraseanet/tests/Alchemy/Tests/Phrasea/Utilities
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
..
2014-02-14 15:51:09 +01:00
2014-08-19 16:35:57 +02:00