|
|
2c732d4062
|
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 |
|
|
|
8fb64b6807
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
baf27fa918
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
cbe66a5855
|
Fixing remaining bugs for route-restructure
|
2016-04-09 10:42:22 +02:00 |
|
|
|
6db172956b
|
Templating
|
2016-01-09 19:46:27 +01:00 |
|
|
|
4e5b92e70c
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
