Files
Phraseanet/tests/Alchemy/Tests/Phrasea
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-06-19 16:11:27 +02:00
2014-03-05 15:27:24 +01:00
2014-05-30 15:22:00 +02:00
2014-08-20 15:13:41 +02:00
2014-08-20 15:13:41 +02:00
2014-08-20 15:13:41 +02:00
2014-08-19 15:38:49 +02:00
2014-05-30 15:22:00 +02:00
2014-03-05 15:27:24 +01:00
2014-05-30 15:22:00 +02:00
2014-07-17 15:17:04 +02:00
2014-07-17 15:17:04 +02:00
2014-07-17 15:17:04 +02:00
2014-06-17 15:30:41 +02:00
2014-03-05 15:27:24 +01:00
2014-07-17 15:17:04 +02:00
2014-08-26 13:38:01 +02:00
2014-07-17 15:17:04 +02:00
2014-02-25 19:00:53 +01:00
2014-08-20 15:13:41 +02:00