Skip to content
Snippets Groups Projects
Commit 2eb5e7fa authored by Benedikt Heinrichs's avatar Benedikt Heinrichs
Browse files

Working merge

parents 9be4d35f f8c4feb9
No related branches found
No related tags found
2 merge requests!3Merge Cryptography fixes,!2Enable adding support for AES-GCM (http://www.w3.org/2009/xmlenc11#aes128-gcm)...
Show whitespace changes
Inline Side-by-side
Showing
with 386 additions and 13 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment