Commit Graph

9 Commits

Author SHA1 Message Date
500235bca0 File path fixes 2017-01-26 16:42:54 +01:00
ca5845d87d 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
76b80911c8 Adjusting copyright 2017-01-26 16:32:45 +01:00
a014c34e07 Path fix 2016-12-30 20:40:22 +01:00
2e18354fb3 Template & lang fixes 2016-12-14 21:27:04 +01:00
c2dfbacbda Increase php version requirement 2016-12-07 20:56:15 +01:00
1cbf53a814 Fixing remaining bugs for route-restructure 2016-04-09 10:43:09 +02:00
014e9c4c11 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
9209b187f4 Case fix! 2016-03-26 18:59:38 +01:00