summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-03-21 09:49:15 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-03-21 09:49:15 +0100
commitc77412b1ac4b866d1f5c32239ed03194230d1d54 (patch)
tree418f80873bd76444ab7bab40e5246eafb7d6468e /lib
parent8442516e1067a7132f52b10b24d436909fb9f7f7 (diff)
parentb6050b44c27e74d87c813f108976c62a0fa31cb9 (diff)
downloadnextcloud-server-c77412b1ac4b866d1f5c32239ed03194230d1d54.tar.gz
nextcloud-server-c77412b1ac4b866d1f5c32239ed03194230d1d54.zip
Merge pull request #22792 from owncloud/no-recovery-key-if-the-master-key-is-enabled
disable the recovery key if the master key is enabled
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions