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
..
2014-01-06 15:40:56 +01:00
2014-02-04 11:25:59 +01:00
2014-01-14 12:04:38 +01:00
2014-01-14 12:04:38 +01:00
2014-01-14 12:04:38 +01:00
2014-02-05 11:25:41 +01:00
2014-02-05 19:42:22 +01:00
2014-02-03 19:02:22 +01:00
2014-01-06 15:38:14 +01:00
2014-01-14 12:04:38 +01:00
2014-01-14 12:04:38 +01:00
2014-01-06 15:38:14 +01:00
2014-01-14 12:04:38 +01:00
2014-01-14 15:05:44 +01:00
2014-01-06 15:40:56 +01:00
2014-01-27 20:12:13 +01:00
2014-01-14 12:04:38 +01:00
2014-01-06 15:38:14 +01:00
2014-02-05 11:25:41 +01:00
2014-02-05 15:25:52 +01:00
2014-02-05 19:42:22 +01:00
2014-01-24 18:52:14 +01:00
2014-02-03 19:13:45 +01:00
2014-01-06 15:40:56 +01:00
2014-01-27 17:23:03 +01:00
2014-01-06 15:38:14 +01:00
2014-02-04 11:25:59 +01:00
2014-02-03 19:02:22 +01:00