Commit Graph

5 Commits

Author SHA1 Message Date
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
f67c5d966b Prepare const visibility 2016-12-07 20:23:04 +01:00
0bffa7f0bc Draft ProjectManagement and EventManagement models 2016-03-13 00:14:39 +01:00