]> source.dussan.org Git - nextcloud-server.git/commit
projects / nextcloud-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 16e331f 57cd95f)
Merge branch 'master' into refactor/OC-Server-getEncryptionFilesHelper 40122/head
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>
Tue, 4 Jun 2024 13:47:48 +0000 (15:47 +0200)
committerGitHub <noreply@github.com>
Tue, 4 Jun 2024 13:47:48 +0000 (15:47 +0200)
commit9197676b8210708e7cf0782d42156b47ccae186e
tree0c034529aa903d116261f909e5b26bf19db0d50etree | snapshot
parent16e331ffb94b016895b0de21159b78061b3899e2commit | diff
parent57cd95f804cd2e8fe6e955dc032b1fbc73024a19commit | diff
Merge branch 'master' into refactor/OC-Server-getEncryptionFilesHelper

Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
lib/private/Encryption/EncryptionWrapper.php diff1 | diff2 | blob | history
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server