diff options
author | C. Montero Luque <cmonteroluque@users.noreply.github.com> | 2016-03-04 18:02:32 -0500 |
---|---|---|
committer | C. Montero Luque <cmonteroluque@users.noreply.github.com> | 2016-03-04 18:02:32 -0500 |
commit | 4b856609848072031e14893df577b9335b8cc072 (patch) | |
tree | 1b08c0687d5b235c46bc2c3f8cddc16ce5b17997 | |
parent | 5080c34d78261cfc2d47d56337e55ba497686280 (diff) | |
parent | 121ff350d4c3972f5ac81e16dbea86adf2c3d280 (diff) | |
download | nextcloud-server-4b856609848072031e14893df577b9335b8cc072.tar.gz nextcloud-server-4b856609848072031e14893df577b9335b8cc072.zip |
Merge pull request #22871 from owncloud/enable-federation-app-stable9
[stable9] Automatically enabled federation app
-rw-r--r-- | apps/federation/appinfo/info.xml | 1 | ||||
-rw-r--r-- | build/integration/features/provisioning-v1.feature | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml index be591b5b693..d373d5ae23f 100644 --- a/apps/federation/appinfo/info.xml +++ b/apps/federation/appinfo/info.xml @@ -11,6 +11,7 @@ <dependencies> <owncloud min-version="9.0" max-version="9.0" /> </dependencies> + <default_enable/> <types> <authentication/> </types> diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature index 04a706f387b..8c32c04523c 100644 --- a/build/integration/features/provisioning-v1.feature +++ b/build/integration/features/provisioning-v1.feature @@ -285,6 +285,7 @@ Feature: provisioning | comments | | dav | | federatedfilesharing | + | federation | | files | | files_sharing | | files_trashbin | |