Skip to content
Snippets Groups Projects
Commit f920d7b7 authored by Jono Wenger's avatar Jono Wenger
Browse files

Merge remote-tracking branch 'origin/XX-4279/ChannelsDatabaseEncryption' into... 

Merge remote-tracking branch 'origin/XX-4279/ChannelsDatabaseEncryption' into XX-4280/IndexedDbEncryption

# Conflicts:
#	go.mod
#	go.sum
#	wasm/channels.go
parents 3135d79f ff008f17
No related branches found
No related tags found
3 merge requests!60Revert "Fail a test to be sure it works",!21added optional db encryption,!20Create JS bindings for ChannelDbCipher
Hide whitespace changes
Inline Side-by-side
Showing
with 120 additions and 72 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment