|
|
80e26028ff
|
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 |
|
|
|
542f31a603
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
e60c9cc56c
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
015d34fac8
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
0b8138b844
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
017833af26
|
Usage of InfoManager
|
2016-04-02 17:47:30 +02:00 |
|
|
|
232fb3c9e9
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
