Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-01-25 11:38:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3a4fdced2b
oms-Admin/Theme/Backend
History
Dennis Eichhorn 3a4fdced2b Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Draw/Controller.js
#	Draw/Models/DrawType.enum.js
#	Draw/Models/Editor.js
#	Media/Models/UploadFile.php
2017-01-26 16:42:29 +01:00
..
Lang Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
accounts-create.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
accounts-list.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
accounts-single.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
groups-create.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
groups-list.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
groups-single.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
modules-list.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
modules-settings.tpl.php Case fix! 2016-03-26 18:59:38 +01:00
modules-single.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
settings-general.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00