Nicolas Le Goff c4eadb7e0e Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Controller/Prod/TOU.php
	lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Security/Firewall.php
	lib/classes/task/abstract.php
	tests/Alchemy/Tests/Phrasea/Security/FirewallTest.php

2014-02-05 19:42:22 +01:00

..

Alchemy/Phrasea

Merge branch '3.8'

2014-02-05 19:42:22 +01:00

classes

Make log messages more understandable

2014-02-05 15:17:34 +01:00

conf.d

Merge branch '3.8'

2014-02-03 19:02:22 +01:00

Fixtures

Rename files

2012-09-19 15:39:29 +02:00

autoload.php

Update autoloader path

2013-05-31 11:40:52 +02:00