Commit Graph

9 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
d37db29c10 Core adjustments for pending issues 2016-10-02 12:07:05 +02:00
d8cf1b0096 Unit test bug fixes 2016-04-24 20:47:29 +02:00
eb3e82febe Unit test fixes 2016-04-22 17:44:28 +02:00
0bffa7f0bc Draft ProjectManagement and EventManagement models 2016-03-13 00:14:39 +01:00
ece832371d Remove namespace from scalars 2016-01-23 10:17:21 +01:00
7d58a2eff5 Init 2015-11-29 21:57:18 +01:00