Commit Graph

54 Commits

Author SHA1 Message Date
532775c66a 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
a41c633ede Adjusting copyright 2017-01-26 16:32:45 +01:00
f9ba82cd0d Increase php version requirement 2016-12-07 20:56:15 +01:00
463e78cd6b Case fix! 2016-03-26 18:59:38 +01:00