Commit Graph

5 Commits

Author SHA1 Message Date
daa39bfc89 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
e254aef924 Adjusting copyright 2017-01-26 16:32:45 +01:00
49f480f59a Increase php version requirement 2016-12-07 20:56:15 +01:00
efaecf1d8a Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
bc7c18e94e Case fix! 2016-03-26 18:59:38 +01:00