|
|
48ed64a02f
|
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 |
|
|
|
8f569642a3
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
b68b183bc6
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
51c8ede310
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
f10049287d
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
b6d6ea716e
|
Fixing remaining bugs for route-restructure
|
2016-04-09 10:42:22 +02:00 |
|
|
|
a22fe2714b
|
Usage of InfoManager
|
2016-04-02 17:47:30 +02:00 |
|
|
|
e476151784
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
