Commit Graph

6 Commits

Author SHA1 Message Date
56a5329850 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
bc2fea8c65 Adjusting copyright 2017-01-26 16:32:45 +01:00
4c51373297 Added log view 2016-12-30 20:40:17 +01:00
137fd22f7c Increase php version requirement 2016-12-07 20:56:15 +01:00
a13eb11c25 Fixing remaining bugs for route-restructure 2016-04-09 10:43:09 +02:00
0eaec886d4 Restructure 2015-12-31 18:05:19 +01:00