Commit Graph

8 Commits

Author SHA1 Message Date
7d2caebe42 Bulkl path fix reverse 2017-02-12 21:43:10 +01:00
dc2c4dd301 Bulkl path fix 2017-02-12 21:42:39 +01:00
4b50c6937f 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
328f1c53e0 Adjusting copyright 2017-01-26 16:32:45 +01:00
1e663ab134 Increase php version requirement 2016-12-07 20:56:15 +01:00
fee0ffe4ef Prepare const visibility 2016-12-07 20:23:04 +01:00
c7943318b3 Adjust database pool name 2016-10-29 20:44:52 +02:00
719ee857e8 Templating 2016-07-03 15:30:25 +02:00