|
|
ca5845d87d
|
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 |
|
|
|
76b80911c8
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
29e9a92486
|
Added log view
|
2016-12-30 20:40:17 +01:00 |
|
|
|
2e18354fb3
|
Template & lang fixes
|
2016-12-14 21:27:04 +01:00 |
|
|
|
c2dfbacbda
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
1cbf53a814
|
Fixing remaining bugs for route-restructure
|
2016-04-09 10:43:09 +02:00 |
|
|
|
69a2b4a111
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
