Skip to content
Commit 2dd2004e authored by Jaco Greeff's avatar Jaco Greeff
Browse files

Merge branch 'master' into jg-signer-decoding 

# Conflicts:
#	js/src/views/Signer/components/RequestFinished/requestFinished.js
parents 7e2a072a 3837114e
Hide whitespace changes
Inline Side-by-side
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