|
|
daa39bfc89
|
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 |
|
|
|
e254aef924
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
49f480f59a
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
26afb1aae2
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
0ad430d497
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
e6f8466085
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
|
|
8a800f0116
|
Renamin navigation install files
|
2015-12-29 21:52:47 +01:00 |
|
|
|
b53e7115e3
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
