Merge origin/ci into ci

Conflicts: application/config/rest.php application/libraries/FHC_Auth.php tests/codeception/api/LoginCept.php
2026-07-21 17:02:19 +00:00 · 2016-04-20 17:57:55 +02:00
parent 0ffe7fbcc6
commit 78e4c2900b
23 changed files with 914 additions and 445 deletions
@@ -60,4 +60,4 @@ class FHC_Auth
 		
 		return md5($aam->getPasswordByUsername($username));
 	}
-}
+}