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

..

Adapter.php

Merge branch '3.8'

2013-11-12 19:19:13 +01:00

Interface.php

Add ACL Manipulator

2013-11-08 17:51:14 +01:00

Query.php

Remove dead code

2013-09-04 12:14:50 +02:00

QueryInterface.php

Bump copyright year

2013-01-21 23:28:58 +01:00