diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-12 10:31:39 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-12 10:31:39 +0200 |
| commit | de5eed4fb0363855da47b93fa94ad03e13bd7159 (patch) | |
| tree | 8f882f079ee02e731594fe1d3f90e9417728abf0 /apps/files_encryption/js/settings-admin.js | |
| parent | 506c9de5cd44eddc89402950a734564451b2fbcd (diff) | |
| parent | aab3b7d8eaf4e6cd366e2d14a88c4e6544444db2 (diff) | |
| download | nextcloud-server-de5eed4fb0363855da47b93fa94ad03e13bd7159.tar.gz nextcloud-server-de5eed4fb0363855da47b93fa94ad03e13bd7159.zip | |
Merge branch 'master' of github.com:owncloud/core
Diffstat (limited to 'apps/files_encryption/js/settings-admin.js')
0 files changed, 0 insertions, 0 deletions