]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into refactor/OC-Server-getEncryptionFilesHelper
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>
Thu, 30 May 2024 12:25:07 +0000 (14:25 +0200)
committerGitHub <noreply@github.com>
Thu, 30 May 2024 12:25:07 +0000 (14:25 +0200)
commit16e331ffb94b016895b0de21159b78061b3899e2
tree951db3be5a6829f970ff3368c3e2d0f5c3401ccb
parentbe4e30917d1c7f77c1ed15d9c53dbea4f5918170
parent31b0a44cf65b6625636ea0fa15fb1a1122b525e1
Merge branch 'master' into refactor/OC-Server-getEncryptionFilesHelper

Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
lib/private/Encryption/EncryptionWrapper.php
lib/private/Encryption/HookManager.php