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

..

custom

Added some empty dirs

2011-12-07 18:10:57 +01:00

include

Merge branch '3.8'

2014-02-04 11:25:59 +01:00

scripts

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

skins

Merge branch '3.8'

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

.htaccess

Revert apache htaccess

2013-05-24 16:27:23 +02:00

api.php

Bump copyright year

2014-01-06 15:28:12 +01:00

crossdomain.xml

V 3.5 RC 1

2011-12-05 00:23:28 +01:00

favicon.ico

initial import

2011-02-16 16:09:48 +01:00

index_dev.php

Bump copyright year

2014-01-06 15:28:12 +01:00

index.php

Bump copyright year

2014-01-06 15:28:12 +01:00