|
|
863cf9348d
|
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 |
|
|
|
8bb7d0377b
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
6e42eb46de
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
2dc20e0dd4
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
a82930346e
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
d2152236f5
|
Fixing remaining bugs for route-restructure
|
2016-04-09 10:42:22 +02:00 |
|
|
|
742f940ad8
|
Usage of InfoManager
|
2016-04-02 17:47:30 +02:00 |
|
|
|
694aee1200
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
