hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 12:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
12f9575a8b93a5f86dd89c42a22ff33c82fbe2c8
Phraseanet/lib/Alchemy/Phrasea/Controller/User
History
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
..
Notifications.php
Merge branch '3.8'
2014-02-05 19:42:22 +01:00
Preferences.php
Merge branch '3.8'
2014-02-05 19:42:22 +01:00