Commit Graph

8 Commits

Author SHA1 Message Date
f0263c0bee 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
d596a93657 Adjusting copyright 2017-01-26 16:32:45 +01:00
7ec137c6cb Increase php version requirement 2016-12-07 20:56:15 +01:00
9bba016706 Database draft 2016-07-27 10:52:11 +02:00
762dbabec7 Dasbhoard draft fix 2016-07-22 21:22:44 +02:00
87afaaea78 Path fix 2016-07-22 20:24:51 +02:00
01a1cadf5b Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
e3471259b0 Case fix! 2016-03-26 18:59:38 +01:00