|
|
164c44922e
|
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 |
|
|
|
e98a972f58
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
e3593e2db1
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
51d8f85724
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
6bd302c7f3
|
Namespace fixes
|
2016-03-31 21:53:31 +02:00 |
|
|
|
96a3db94b6
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
|
|
5219dbd23c
|
New admin classes (activate, deactivate, uninstall, update)
|
2015-12-30 22:51:05 +01:00 |
|
