Commit Graph

5 Commits

Author SHA1 Message Date
daa39bfc89 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
e254aef924 Adjusting copyright 2017-01-26 16:32:45 +01:00
49f480f59a Increase php version requirement 2016-12-07 20:56:15 +01:00
5e2fb47236 Prepare const visibility 2016-12-07 20:23:04 +01:00
b53e7115e3 Init 2015-11-29 21:57:18 +01:00