Commit Graph

5 Commits

Author SHA1 Message Date
8ed7537cda 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
8f7fe618ee Adjusting copyright 2017-01-26 16:32:45 +01:00
b92bc84ebe Increase php version requirement 2016-12-07 20:56:15 +01:00
eee2c85445 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
56fa001bf9 Restructure 2015-12-31 18:05:19 +01:00