Merge origin/ci into ci

Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
This commit is contained in:
paolo
2016-04-18 09:03:15 +02:00
4 changed files with 1 additions and 657 deletions
+1 -1
View File
@@ -35,7 +35,7 @@ class FHC_Auth
* @param string $password
* @return bool
*/
function basicAuthentication($username, $password)
public function basicAuthentication($username, $password)
{
$auth = new authentication();
if($auth->checkpassword($username, $password))