Files
Phraseanet/lib/classes
Romain Neutron 9580ff7585 Merge branch '3.8'
Conflicts:
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/task/period/archive.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/login/layout/base-layout.html.twig
2013-12-09 14:17:03 +01:00
..
2013-12-03 20:06:49 +01:00
2013-11-20 16:49:29 +01:00
2013-12-03 20:59:47 +01:00
2013-11-20 16:49:29 +01:00
2013-12-03 20:05:20 +01:00
2013-11-20 16:49:29 +01:00
2013-12-03 20:05:20 +01:00
2013-11-20 16:49:29 +01:00
2013-11-20 16:49:29 +01:00
2013-12-03 20:02:40 +01:00
2013-12-03 21:01:43 +01:00
2013-12-09 14:17:03 +01:00
2013-11-20 16:04:20 +01:00
2013-11-20 16:49:29 +01:00
2013-12-03 20:02:40 +01:00
2013-11-20 16:49:29 +01:00
2013-11-20 16:49:29 +01:00
2013-11-20 16:49:29 +01:00
2013-12-03 21:32:46 +01:00
2013-11-20 16:49:29 +01:00
2013-12-04 14:52:40 +01:00
2013-11-18 13:57:33 +01:00
2013-11-20 16:49:29 +01:00
2013-11-20 16:49:29 +01:00
2013-12-03 20:02:40 +01:00
2013-11-20 19:03:55 +01:00
2013-11-20 19:03:55 +01:00
2013-09-04 12:14:50 +02:00
2013-11-20 19:03:55 +01:00
2013-11-20 19:03:55 +01:00
2013-12-03 20:05:20 +01:00
2013-12-03 20:02:40 +01:00
2013-11-18 13:57:33 +01:00
2013-01-29 16:39:02 +01:00
2013-11-20 16:49:29 +01:00
2013-11-20 16:49:29 +01:00
2013-11-20 16:49:29 +01:00
2013-11-20 19:03:55 +01:00
2013-11-20 16:49:29 +01:00
2013-11-18 13:57:33 +01:00
2013-01-29 18:34:50 +01:00