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

Merge branch 'master' into ui-2

# Conflicts:
#	js/src/views/Signer/RequestsPage/requestsPage.js
parents 234b8dd5 c9b2a7a9
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