diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-11-23 10:42:14 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-11-23 10:42:14 +0100 |
| commit | bf672d7e51bd3411130a3c3a41a931fb3d23ff68 (patch) | |
| tree | 41185570e7a50290dee0fc5fb359e20e098769e4 /core | |
| parent | 43391f8f47d82eca4605ed9255d551ca3a9cbf33 (diff) | |
| parent | a63a1043b6a40193a44d2fb1b702a775bb761c8d (diff) | |
| download | nextcloud-server-bf672d7e51bd3411130a3c3a41a931fb3d23ff68.tar.gz nextcloud-server-bf672d7e51bd3411130a3c3a41a931fb3d23ff68.zip | |
Merge pull request #20222 from owncloud/federated_sharing_auto_complete
federated sharing auto-complete, first step
Diffstat (limited to 'core')
| -rw-r--r-- | core/shipped.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/shipped.json b/core/shipped.json index cd1fca4d9fe..a7466a41aef 100644 --- a/core/shipped.json +++ b/core/shipped.json @@ -32,7 +32,8 @@ "user_ldap", "user_shibboleth", "windows_network_drive", - "password_policy" + "password_policy", + "federation" ], "alwaysEnabled": [ "files", |