Commit Graph

4 Commits

Author SHA1 Message Date
aa0ad46978 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
aaa19fb725 Adjusting copyright 2017-01-26 16:32:45 +01:00
ace1258f14 Increase php version requirement 2016-12-07 20:56:15 +01:00
99fe23d325 Case fix! 2016-03-26 18:59:38 +01:00