blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-22 17:32:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/ci into ci

Browse Source 
Conflicts:
	application/config/rest.php
	application/controllers/api/v1/APIAuth.php
This commit is contained in:
paolo
2016-04-11 17:35:14 +02:00
parent 7032d8be7f 4e2e943ae2
commit d689953b83
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/APIAuth.php
+1
View File
@@ -10,6 +10,7 @@
* @link http://whisperocity.com/
* @since Version 1.0
* @filesource
* @example curl -H "FHC-API-Key: testapikey@fhcomplete.org" http://localhost/fhcomplete/index.ci.php/api/v1/APIAuth/login?code=aladsfasdf
*/
// ------------------------------------------------------------------------