Skip to content
Commit d87a8323 authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/stable' into... 

Merge remote-tracking branch 'origin/stable' into test/11394-symmetric-encryption-with-openpgp-aplet-is-fragile
parents eba1538c af176be0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment