summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-03 16:09:02 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-03 16:09:02 +0100
commitdfeb6ea49117654842157f66798ecea6367a7626 (patch)
tree6edf49a441dc8f7789d1bfdfa986e137a2bfb839 /core
parente34ec0a138f8f8d2792c595f7a20e3dd8efc6b28 (diff)
parent9bbb7b1c3e9f217788cb1d39c369b4cb0ed081fc (diff)
downloadnextcloud-server-dfeb6ea49117654842157f66798ecea6367a7626.tar.gz
nextcloud-server-dfeb6ea49117654842157f66798ecea6367a7626.zip
Merge pull request #22086 from RealRancor/RealRancor-patch-1
Remove files_locking from shipped.json
Diffstat (limited to 'core')
-rw-r--r--core/shipped.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/shipped.json b/core/shipped.json
index 5f995326625..069bb210ba7 100644
--- a/core/shipped.json
+++ b/core/shipped.json
@@ -13,7 +13,6 @@
"files_drop",
"files_external",
"files_ldap_home",
- "files_locking",
"files_pdfviewer",
"files_sharing",
"files_sharing_log",