|
|
dfaec66351
|
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 |
|
|
|
822220dada
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
24b8eb31fc
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
f967450cad
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
ebd7ac6fa1
|
Namespace fixes
|
2016-03-31 21:53:31 +02:00 |
|
|
|
b17e25c56e
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
|
|
e2e99eab5a
|
New admin classes (activate, deactivate, uninstall, update)
|
2015-12-30 22:51:05 +01:00 |
|
