diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-08-17 13:15:22 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-08-17 13:15:22 +0200 |
| commit | cabe92ef1240e171a812f5822ac69b4d7742fd71 (patch) | |
| tree | 469e9089107d440da0c12c291abbd626d6d08b33 /settings/admin.php | |
| parent | 7adfc27cafa6f94962a33c158af9c45e71e012c5 (diff) | |
| parent | d3e2f31adad5eeaf415154dd2fb88cb9fec0b3c1 (diff) | |
| download | nextcloud-server-cabe92ef1240e171a812f5822ac69b4d7742fd71.tar.gz nextcloud-server-cabe92ef1240e171a812f5822ac69b4d7742fd71.zip | |
Merge branch 'master' into decrypt_files_again
Conflicts:
apps/files_encryption/tests/keymanager.php
Diffstat (limited to 'settings/admin.php')
0 files changed, 0 insertions, 0 deletions