]> source.dussan.org Git - nextcloud-server.git/commit
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)
commite0aa6e01ab14191f42b2e79d32a9e0cc0203f975
treeb04551d57ab6589d12063e14238b61fe032a4a86
parenta5e46226eff081ca869ac2a0a7b80086c863a384
parent46f6c289cac2ad20f9b57e1aff2894a38221a917
Merge pull request #21612 from owncloud/fix_21598

fix public link sharing if the master key is enabled
apps/encryption/lib/keymanager.php
apps/encryption/tests/lib/KeyManagerTest.php