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
..
2011-12-05 00:23:28 +01:00
2011-12-05 00:23:28 +01:00
2012-07-18 16:36:37 +02:00
2011-12-05 00:23:28 +01:00
2013-08-21 18:33:39 +02:00
2013-11-12 17:49:58 +01:00
2013-11-12 17:49:58 +01:00
2012-10-01 14:39:03 +02:00
2012-08-31 16:57:43 +02:00
2011-02-16 16:09:48 +01:00
2011-02-16 16:09:48 +01:00
2011-02-16 16:09:48 +01:00
2011-02-16 16:09:48 +01:00
2011-02-16 16:09:48 +01:00
2013-06-21 13:46:16 +02:00
2011-02-16 16:09:48 +01:00
2011-12-05 00:23:28 +01:00
2013-01-17 11:43:30 +01:00
2011-02-16 16:09:48 +01:00
2012-02-03 17:10:49 +01:00
2011-02-16 16:09:48 +01:00
2011-02-16 16:09:48 +01:00
2013-08-17 17:12:57 +02:00
2011-12-05 00:23:28 +01:00
2012-04-12 17:29:39 +02:00