Jingga/oms-Messages
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Messages.git synced 2026-02-07 21:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
d4b4962726
oms-Messages/Theme/Backend
History
Dennis Eichhorn d4b4962726 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
dashboard.tpl.php Adjusting copyright 2017-01-26 16:32:45 +01:00
mail-create.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
mail-out-view.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
mail-spam-view.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
mail-trash-view.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
mail-view.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
message-settings.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00