Merge branch 'master' into ocis-1132

This commit is contained in:
A.Unger
2020-12-03 16:42:45 +01:00
17 changed files with 58 additions and 33 deletions
+1
View File
@@ -138,6 +138,7 @@ func Frontend(cfg *config.Config) *cli.Command {
"disable_tus": cfg.Reva.UploadDisableTus,
},
"ocs": map[string]interface{}{
"share_prefix": cfg.Reva.Frontend.OCSSharePrefix,
"prefix": cfg.Reva.Frontend.OCSPrefix,
"config": map[string]interface{}{
"version": "1.8",