Commit Graph

8 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
d0451d392b Adjust database pool name 2016-10-29 20:44:52 +02:00
5b5cf04b67 Fix install 2016-10-09 20:07:30 +02:00
828c9c4adc Restructure 2015-12-31 18:05:19 +01:00
f8e78ebfd8 Renamin navigation install files 2015-12-29 21:52:47 +01:00
7d58a2eff5 Init 2015-11-29 21:57:18 +01:00