Commit Graph

4 Commits

Author SHA1 Message Date
48ed64a02f 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
8f569642a3 Adjusting copyright 2017-01-26 16:32:45 +01:00
b68b183bc6 Increase php version requirement 2016-12-07 20:56:15 +01:00
54292bb6fb Restructure 2015-12-31 18:05:19 +01:00