Merge pull request #22871 from owncloud/enable-federation-app-stable9

[stable9] Automatically enabled federation app
2016-03-04 18:02:32 -05:00 · 2016-03-04 18:02:32 -05:00 · 4b85660984
parent 5080c34d78 121ff350d4
commit 4b85660984
2 changed files with 2 additions and 0 deletions
--- 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>
--- 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 |