|
|
d4b4962726
|
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 |
|
|
|
0da6628455
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
7c3531dbf3
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
b709874943
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
f60ed3ac72
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
fa350c344d
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
|
|
bba8674a8f
|
Renamin navigation install files
|
2015-12-29 21:52:47 +01:00 |
|
|
|
0f28b9e7d6
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
