|
|
8ed7537cda
|
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 |
|
|
|
8f7fe618ee
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
b92bc84ebe
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
4b5cc3279b
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
f6f2990c15
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
56fa001bf9
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
|
|
c9ffccd0de
|
Renamin navigation install files
|
2015-12-29 21:52:47 +01:00 |
|
|
|
837709c3f8
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
