summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2018-08-17 15:08:29 +0200
committerGitHub <noreply@github.com>2018-08-17 15:08:29 +0200
commit20aa21c908e770746b1db4164838749fc53550fb (patch)
tree5ae91379c299ae18617e888849ceea361ac9be02
parent3a44cce5cc7f57acd1df4b7cfb1e3dbf9a4fb23c (diff)
parent325e8bea16e9853c98af6e2f70c3693ede2a2bf9 (diff)
downloadnextcloud-server-20aa21c908e770746b1db4164838749fc53550fb.tar.gz
nextcloud-server-20aa21c908e770746b1db4164838749fc53550fb.zip
Merge pull request #10731 from nextcloud/update-bundles
add deck and mail to the groupware bundle, remove talk
-rw-r--r--lib/private/App/AppStore/Bundles/GroupwareBundle.php3
-rw-r--r--tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php3
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/private/App/AppStore/Bundles/GroupwareBundle.php b/lib/private/App/AppStore/Bundles/GroupwareBundle.php
index 042d97c3efc..4f0a815bfc8 100644
--- a/lib/private/App/AppStore/Bundles/GroupwareBundle.php
+++ b/lib/private/App/AppStore/Bundles/GroupwareBundle.php
@@ -39,7 +39,8 @@ class GroupwareBundle extends Bundle {
return [
'calendar',
'contacts',
- 'spreed',
+ 'deck',
+ 'mail'
];
}
diff --git a/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php b/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php
index f2f9dcc5ccc..ccff5dcbd34 100644
--- a/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php
+++ b/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php
@@ -32,7 +32,8 @@ class GroupwareBundleTest extends BundleBase {
$this->bundleAppIds = [
'calendar',
'contacts',
- 'spreed',
+ 'deck',
+ 'mail'
];
}
}