|
|
3a4fdced2b
|
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 |
|
|
|
697294b655
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
3ccfaf607a
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
3c4fe4836c
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
240d7ff853
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
4426d95f01
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
|
|
537fea58bb
|
Renamin navigation install files
|
2015-12-29 21:52:47 +01:00 |
|
|
|
d9badeada7
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
