|
|
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 |
|
|
|
8989ea0e80
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
96a3db94b6
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
|
|
6c78e14d5f
|
Renamin navigation install files
|
2015-12-29 21:52:47 +01:00 |
|
|
|
f2d0afaeef
|
Split
|
2015-12-18 17:43:42 +01:00 |
|
