]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #21612 from owncloud/fix_21598
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 13 Jan 2016 09:34:48 +0000 (10:34 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 13 Jan 2016 09:34:48 +0000 (10:34 +0100)
fix public link sharing if the master key is enabled

1  2 
apps/encryption/lib/keymanager.php
apps/encryption/tests/lib/KeyManagerTest.php

Simple merge