|
|
80e26028ff
|
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 |
|
|
|
542f31a603
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
41dba68a95
|
Template, comment and path fixes
|
2016-12-30 19:59:24 +01:00 |
|
|
|
e629f8b092
|
Template & lang fixes
|
2016-12-14 21:27:04 +01:00 |
|
|
|
e60c9cc56c
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
3e781409a9
|
Fixing remaining bugs for route-restructure
|
2016-04-09 10:43:09 +02:00 |
|
|
|
3e2ad6400a
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
