Commit Graph

6 Commits

Author SHA1 Message Date
d9fe7a618f 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
7428508d17 Adjusting copyright 2017-01-26 16:32:45 +01:00
26e58684b5 Increase php version requirement 2016-12-07 20:56:15 +01:00
6cb6f5010e Prepare const visibility 2016-12-07 20:23:04 +01:00
e81a1102f7 Unit test fixes 2016-04-22 17:44:28 +02:00
f4f7a5a235 Init 2015-11-29 21:57:18 +01:00