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

Merge

Browse Source
This commit is contained in:
Paminger
2016-05-10 14:37:13 +02:00
parent 4b9d5d273b
commit 4b1691361b
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/fhcomplete.php
-5
View File
@@ -22,12 +22,7 @@ $config['fhc_acl'] = array
'public.tbl_prestudent' => 'basis/person',
'public.tbl_prestudentstatus' => 'basis/person',
'public.tbl_organisationseinheit' => 'basis/organisationseinheit',
<<<<<<< HEAD
'public.tbl_sprache' => 'admin',
'public.tbl_msg_thread' => 'admin',
'public.tbl_msg_message' => 'admin'
);
=======
'public.tbl_sprache' => 'admin'
);
>>>>>>> 44ebe15c9cab8fbbf8396d255648b8afda0f5d14