summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2016-08-05 15:11:28 +0200
committerGitHub <noreply@github.com>2016-08-05 15:11:28 +0200
commitdd44624540ee56dca6ba51be647b9572cef5fb5e (patch)
tree4c1568cae850a9a38fdc9e783f8331bba181684f /core
parent84e6b8d9d05f7e481276090101ddf77f1ab3cfdf (diff)
parent89cb7b59f8a43ce27443af50611d4d821255b79b (diff)
downloadnextcloud-server-dd44624540ee56dca6ba51be647b9572cef5fb5e.tar.gz
nextcloud-server-dd44624540ee56dca6ba51be647b9572cef5fb5e.zip
Merge pull request #732 from nextcloud/fix-shipped.json
Order alphabetically and deduplicate the shipped.json
Diffstat (limited to 'core')
-rw-r--r--core/shipped.json10
1 files changed, 4 insertions, 6 deletions
diff --git a/core/shipped.json b/core/shipped.json
index 1b303af52f9..f944d9d4c11 100644
--- a/core/shipped.json
+++ b/core/shipped.json
@@ -13,6 +13,7 @@
"files_automatedtagging",
"files_external",
"files_pdfviewer",
+ "files_retention",
"files_sharing",
"files_texteditor",
"files_trashbin",
@@ -23,6 +24,8 @@
"notifications",
"password_policy",
"provisioning_api",
+ "serverinfo",
+ "survey_client",
"systemtags",
"templateeditor",
"theming",
@@ -30,12 +33,7 @@
"user_external",
"user_ldap",
"user_saml",
- "workflowengine",
- "files_accesscontrol",
- "files_automatedtagging",
- "files_retention",
- "serverinfo",
- "survey_client"
+ "workflowengine"
],
"alwaysEnabled": [
"files",