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

Merge branch 'master' into ui-2 

# Conflicts:
#	js/src/shell/Connection/connection.js
#	js/src/ui/Icons/index.js
#	js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.js
parents 6978e387 2fd44e6c
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