Commit Graph

9 Commits

Author SHA1 Message Date
532775c66a 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
a41c633ede Adjusting copyright 2017-01-26 16:32:45 +01:00
f9ba82cd0d Increase php version requirement 2016-12-07 20:56:15 +01:00
afce86894f Adjust database pool name 2016-10-29 20:44:52 +02:00
b719340c66 Fix install 2016-10-09 20:07:30 +02:00
21088933b3 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
2d648a9e5d Usage of InfoManager 2016-04-02 17:47:30 +02:00
c2f9d6fd00 Unit test fixes 2016-02-04 21:10:48 +01:00
f1691ed8d9 Init 2015-11-29 21:57:18 +01:00