|
|
ca5845d87d
|
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 |
|
|
|
76b80911c8
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
c2dfbacbda
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
fd43129d7e
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
35500e7841
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
69a2b4a111
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
|
|
d4097a2b91
|
Renamin navigation install files
|
2015-12-29 21:52:47 +01:00 |
|
|
|
9b7500858a
|
Init
|
2015-11-29 21:57:18 +01:00 |
|