Commit Graph

5 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
9c219ca7c5 Unit test bug fixes 2016-04-24 20:47:29 +02:00
62fec13e3f Doc + Mapper::class implementation 2016-03-09 23:11:51 +01:00