Jingga/oms-EventManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-EventManagement.git synced 2026-01-24 14:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
d31ce4e49a
oms-EventManagement/Theme/backend
History
Dennis Eichhorn d298815613 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
eventmanagement-create.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
eventmanagement-list.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
eventmanagement-profile.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00