diff options
author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-21 16:00:21 +0100 |
---|---|---|
committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-21 16:00:21 +0100 |
commit | 6443e570c2793954309f9541cd6a7a8c309644ac (patch) | |
tree | 5f9755857200a710c56e3bcf0271910059f15f49 /core/js | |
parent | 87f2696e6a1f8e992a2019212e6cc08c137cc90f (diff) | |
parent | d2e6f7d9790d42faf9d79b7beb07b2d287fd2da3 (diff) | |
download | nextcloud-server-6443e570c2793954309f9541cd6a7a8c309644ac.tar.gz nextcloud-server-6443e570c2793954309f9541cd6a7a8c309644ac.zip |
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
Diffstat (limited to 'core/js')
0 files changed, 0 insertions, 0 deletions