diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-11 15:19:02 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-11 15:19:02 +0200 |
| commit | 20ddd6e1c77224d18d5be74101b80144b7187475 (patch) | |
| tree | 1320acdc30a977f9294dc0ae2f6c36667982da31 /core/lostpassword/controller.php | |
| parent | 64593e4b84fdd6881a43530461c50464303cc42e (diff) | |
| parent | db6080c5c682a2bbdc420399276b81311c17802c (diff) | |
| download | nextcloud-server-20ddd6e1c77224d18d5be74101b80144b7187475.tar.gz nextcloud-server-20ddd6e1c77224d18d5be74101b80144b7187475.zip | |
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/tests/crypt.php
Diffstat (limited to 'core/lostpassword/controller.php')
0 files changed, 0 insertions, 0 deletions