Commit Graph

2 Commits

Author SHA1 Message Date
paolo 346b8c82e1 JSON output improved 2016-04-22 11:08:38 +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