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

..

BasketController.php

Merge branch '3.8'

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

Bridge.php

Merge branch '3.8'

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

DoDownload.php

Merge branch '3.8'

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

Download.php

Merge branch '3.8'

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

Edit.php

Merge branch '3.8'

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

Export.php

Merge branch '3.8'

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

Feed.php

Merge branch '3.8'

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

Language.php

Merge branch '3.8'

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

Lazaret.php

Merge branch '3.8'

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

MoveCollection.php

Merge branch '3.8'

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

Order.php

Merge branch '3.8'

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

Printer.php

Merge branch '3.8'

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

Property.php

Merge branch '3.8'

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

Push.php

Merge branch '3.8'

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

Query.php

Merge branch '3.8'

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

Records.php

Merge branch '3.8'

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

Root.php

Merge branch '3.8'

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

Share.php

Merge branch '3.8'

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

Story.php

Merge branch '3.8'

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

Tools.php

Merge branch '3.8'

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

Tooltip.php

Merge branch '3.8'

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

TOU.php

Merge branch '3.8'

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

Upload.php

Merge branch '3.8'

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

UsrLists.php

Merge branch '3.8'

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

WorkZone.php

Merge branch '3.8'

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