|
|
8a031bdca1
|
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 |
|
|
|
cf73d7b282
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
9247f190ab
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
aa3b0698e1
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
65f3d317f1
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
d90c25bc91
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
|
|
d52ca35377
|
Renamin navigation install files
|
2015-12-29 21:52:47 +01:00 |
|
|
|
360c2fbdee
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
