|
|
80e0e0bd51
|
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 |
|
|
|
53c79f8a46
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
c67fb2c2bf
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
921d205998
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
4c55bd7367
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
0d3196adff
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
|
|
22e4f68b55
|
Renamin navigation install files
|
2015-12-29 21:52:47 +01:00 |
|
|
|
6b6156f16c
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
