diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-21 11:18:53 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-21 11:18:53 +0100 |
| commit | 87f2696e6a1f8e992a2019212e6cc08c137cc90f (patch) | |
| tree | b5ad3c6d91572e014939b8f382f35aecf6ab5935 /core/js | |
| parent | 009bbef17e8636e432f070839a25f99a7780e153 (diff) | |
| parent | c7dc6dc2c2d0d2de72256a6f7bcacaf3ec59bd0c (diff) | |
| download | nextcloud-server-87f2696e6a1f8e992a2019212e6cc08c137cc90f.tar.gz nextcloud-server-87f2696e6a1f8e992a2019212e6cc08c137cc90f.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