|
|
3dce57e942
|
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 |
|
|
|
3a43f30c97
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
1d8f4fe292
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
771ae790bb
|
Fixing remaining bugs for route-restructure
|
2016-04-09 10:43:09 +02:00 |
|
|
|
aafe876972
|
Fixing remaining bugs for route-restructure
|
2016-04-09 10:42:22 +02:00 |
|
|
|
ca3bfa4abb
|
Case fix!
|
2016-03-26 18:59:38 +01:00 |
|
