diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-30 13:36:56 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 13:30:28 +0200 |
| commit | 4441835d189d037a021ba9a11fd96cf55ba2db3f (patch) | |
| tree | be55362cd2100abe8cd6ae6ac5b3b674f4fe4a36 /apps/files_encryption/js/settings-admin.js | |
| parent | 90487384f77d916ab2dbe495b46bdf5182fb875a (diff) | |
| download | nextcloud-server-4441835d189d037a021ba9a11fd96cf55ba2db3f.tar.gz nextcloud-server-4441835d189d037a021ba9a11fd96cf55ba2db3f.zip | |
https://github.com/owncloud/core/pull/15305#discussion_r27382305
Conflicts:
lib/private/files/stream/encryption.php
Diffstat (limited to 'apps/files_encryption/js/settings-admin.js')
0 files changed, 0 insertions, 0 deletions