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

Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci

Browse Source 
Conflicts:
	application/config/autoload.php
	application/controllers/api/v1/Person.php
	application/models/person/Person_model.php
This commit is contained in:
Paminger
2016-04-07 15:20:08 +02:00
parent bcfae6b009 97ddc838a8
commit 34db90ba19
1132 changed files with 2580 additions and 182615 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/rest.php
+1 -1
View File
@@ -301,7 +301,7 @@ $config['rest_keys_table'] = 'ci_apikey';
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
*/
$config['rest_enable_keys'] = TRUE;
$config['rest_enable_keys'] = FALSE;
/*
|--------------------------------------------------------------------------