aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-04-16 11:57:14 +0200
committerJoas Schilling <nickvergessen@gmx.de>2015-04-16 11:57:14 +0200
commit99b0c6e525e71de18245ba434852389349b4f2d7 (patch)
treeb61e31cb12fdb86a28da911f0a674fc07145c821
parent2e06cf49a5ff2eca644b66aa9eec299830eb67bd (diff)
parentb6f79567aaedcb99ffe3489d90a298b78041c7e9 (diff)
downloadnextcloud-server-99b0c6e525e71de18245ba434852389349b4f2d7.tar.gz
nextcloud-server-99b0c6e525e71de18245ba434852389349b4f2d7.zip
Merge pull request #15670 from owncloud/encryption-is-an-shipped-app-master
files_encryption -> encryption
-rw-r--r--core/shipped.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/shipped.json b/core/shipped.json
index 15a2c6a1473..7993b61569c 100644
--- a/core/shipped.json
+++ b/core/shipped.json
@@ -7,7 +7,7 @@
"external",
"files",
"files_antivirus",
- "files_encryption",
+ "encryption",
"files_external",
"files_ldap_home",
"files_locking",