Merge pull request #22870 from owncloud/autoenable-federation-app

Automatically enable "federation" app
2016-03-04 17:44:50 -05:00 · 2016-03-04 17:44:50 -05:00 · fe86e0c2f8
parent 4dda119137 89315722a1
commit fe86e0c2f8
2 changed files with 13 additions and 11 deletions
--- a/apps/federation/appinfo/info.xml
+++ b/apps/federation/appinfo/info.xml
@ -11,6 +11,7 @@
 	<dependencies>
 		<owncloud min-version="9.1" max-version="9.1" />
 	</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 |