|
|
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 |
|
|
|
cf1f0b43be
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
b17e25c56e
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
|
|
6c5fad54ec
|
Renamin navigation install files
|
2015-12-29 21:52:47 +01:00 |
|
|
|
133e8ad225
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
