Commit Graph

7 Commits

Author SHA1 Message Date
6e96b4d0e4 Bulkl path fix reverse 2017-02-12 21:43:10 +01:00
e75346bea2 Bulkl path fix 2017-02-12 21:42:39 +01:00
80e26028ff 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
542f31a603 Adjusting copyright 2017-01-26 16:32:45 +01:00
e60c9cc56c Increase php version requirement 2016-12-07 20:56:15 +01:00
91d8318383 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
5d5513cb2f Case fix! 2016-03-26 18:59:38 +01:00