oms-Editor/Theme/Backend
Dennis Eichhorn 164c44922e 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
editor-create.tpl.php Adjusting copyright 2017-01-26 16:32:45 +01:00
editor-list.tpl.php Adjusting copyright 2017-01-26 16:32:45 +01:00
editor.tpl.php Increase php version requirement 2016-12-07 20:56:15 +01:00