Commit Graph

4 Commits

Author SHA1 Message Date
3e8838eb94 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
fb1dd8d15e Adjusting copyright 2017-01-26 16:32:45 +01:00
d53f224783 Increase php version requirement 2016-12-07 20:56:15 +01:00
9d7d2ef92e Restructure 2015-12-31 18:05:19 +01:00