Commit Graph

2 Commits

Author SHA1 Message Date
paolo 18df562208 Check permissions 2016-04-22 16:31:46 +02:00
paolo 78e4c2900b Merge origin/ci into ci
Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
2016-04-20 17:57:55 +02:00