|
|
164c44922e
|
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 |
|
|
|
e98a972f58
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
074d2c82ba
|
Template, comment and path fixes
|
2016-12-30 19:59:24 +01:00 |
|
|
|
e3593e2db1
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
0371bbe1c5
|
Path fix
|
2016-12-07 18:59:48 +01:00 |
|
|
|
b308c1e032
|
Fixing remaining bugs for route-restructure
|
2016-04-09 10:42:22 +02:00 |
|
|
|
2855f07148
|
Case fix!
|
2016-03-26 18:59:38 +01:00 |
|
