Merge origin/ci into ci

This commit is contained in:
paolo
2016-07-04 15:37:35 +02:00
+1 -1
View File
@@ -199,7 +199,7 @@ $config['fhc_acl'] = array
'system.tbl_berechtigung' => 'basis/berechtigung',
'system.tbl_cronjob' => 'basis/cronjob',
'system.tbl_phrase' => 'system/phrase',
'system.tbl_phrase_inhalt' => 'system/phrase',
'system.tbl_phrasentext' => 'system/phrase',
'system.tbl_rolle' => 'basis/rolle',
'system.tbl_rolleberechtigung' => 'basis/rolleberechtigung',
'system.tbl_server' => 'basis/server',