aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-08 14:12:20 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-08 14:12:20 +0100
commitcf1f92cc12ff8d38c4801d122adc83304cd95e44 (patch)
tree8d29cd3f10e4e6f1ec13df40f2eca7d46feee00e /core
parent97b2e19c786e037acd99e31aabbf193c805617dd (diff)
parent2f6ffdbce552ed519b3e08c1bfe5d100377c52f6 (diff)
downloadnextcloud-server-cf1f92cc12ff8d38c4801d122adc83304cd95e44.tar.gz
nextcloud-server-cf1f92cc12ff8d38c4801d122adc83304cd95e44.zip
Merge pull request #22080 from owncloud/fed_share_provider
implementation of the federated share provider
Diffstat (limited to 'core')
-rw-r--r--core/shipped.json4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/shipped.json b/core/shipped.json
index 069bb210ba7..b74f2f28c47 100644
--- a/core/shipped.json
+++ b/core/shipped.json
@@ -8,6 +8,7 @@
"enterprise_key",
"external",
"federation",
+ "federatedfilesharing",
"files",
"files_antivirus",
"files_drop",
@@ -39,6 +40,7 @@
],
"alwaysEnabled": [
"files",
- "dav"
+ "dav",
+ "federatedfilesharing"
]
}