Files
Phraseanet/lib/Alchemy/Phrasea/Command
Romain Neutron 432252f5f8 Merge branch '3.8'
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/User/Adapter.php
	lib/classes/eventsmanager/broker.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/uploadquarantine.php
	lib/classes/eventsmanager/notify/validationdone.php
	templates/web/admin/index.html.twig
2013-11-12 19:19:13 +01:00
..
2013-11-08 19:04:26 +01:00
2013-09-04 12:14:50 +02:00
2013-09-04 14:25:01 +02:00
2013-10-31 14:22:41 +01:00
2013-11-12 17:58:03 +01:00
2013-10-31 14:01:44 +01:00
2013-11-08 17:51:14 +01:00