Jingga/oms-ClientManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ClientManagement.git synced 2026-01-21 12:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
ca5845d87d
oms-ClientManagement/Theme/Backend
History
Dennis Eichhorn ca5845d87d 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
clients-create.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
clients-list.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
clients-single.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00