diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-05-23 11:11:57 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-05-23 11:11:57 +0200 |
| commit | cb79169cf54bfc9d7c79422ebf118717acf9d980 (patch) | |
| tree | 0acfd20c51432c2a3125be39512fb2c808cbaff1 /apps/files_encryption/js/settings-admin.js | |
| parent | 46c784ccdfd931fee00dd5fd760711027d0b2aec (diff) | |
| parent | 698862519de6b364da6c20a97d8c546204e80f3d (diff) | |
| download | nextcloud-server-cb79169cf54bfc9d7c79422ebf118717acf9d980.tar.gz nextcloud-server-cb79169cf54bfc9d7c79422ebf118717acf9d980.zip | |
Merge branch 'master' into files_encryption
Diffstat (limited to 'apps/files_encryption/js/settings-admin.js')
0 files changed, 0 insertions, 0 deletions