summaryrefslogtreecommitdiffstats
path: root/public.php
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-11-21 16:00:21 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2013-11-21 16:00:21 +0100
commit6443e570c2793954309f9541cd6a7a8c309644ac (patch)
tree5f9755857200a710c56e3bcf0271910059f15f49 /public.php
parent87f2696e6a1f8e992a2019212e6cc08c137cc90f (diff)
parentd2e6f7d9790d42faf9d79b7beb07b2d287fd2da3 (diff)
downloadnextcloud-server-6443e570c2793954309f9541cd6a7a8c309644ac.tar.gz
nextcloud-server-6443e570c2793954309f9541cd6a7a8c309644ac.zip
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
Diffstat (limited to 'public.php')
0 files changed, 0 insertions, 0 deletions