Commit Graph

7 Commits

Author SHA1 Message Date
2caa6146b0 File path fixes 2017-01-26 16:42:54 +01:00
962adb9d3a 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
b34b5da6c6 Adjusting copyright 2017-01-26 16:32:45 +01:00
93d4c86bc8 Increase php version requirement 2016-12-07 20:56:15 +01:00
2e6c3801e1 Path fix 2016-06-26 16:21:36 +02:00
5cfc5d2515 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
57f83a9248 Restructure 2015-12-31 18:05:19 +01:00