Commit Graph

7 Commits

Author SHA1 Message Date
7d6577ebe1 File path fixes 2017-01-26 16:42:54 +01:00
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
0da6628455 Adjusting copyright 2017-01-26 16:32:45 +01:00
7c3531dbf3 Increase php version requirement 2016-12-07 20:56:15 +01:00
dd8133fe1a Fixing remaining bugs for route-restructure 2016-04-09 10:43:09 +02:00
03e01233d7 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
7ff9bf14a3 Case fix! 2016-03-26 18:59:38 +01:00