Commit Graph

5 Commits

Author SHA1 Message Date
e7cd095375 Implement & bug fixes 2017-02-12 16:02:17 +01:00
d298815613 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
732f595d8a Adjusting copyright 2017-01-26 16:32:45 +01:00
723f9a1af1 Increase php version requirement 2016-12-07 20:56:15 +01:00
7d58a2eff5 Init 2015-11-29 21:57:18 +01:00