openethereum/js/src/views/Accounts/CreateAccount/RecoveryPhrase
Jaco Greeff 602115d81e 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
2017-05-19 14:55:13 +02:00
..
index.js UI 2 component & modal splits (#5525) 2017-04-28 11:21:05 +02:00
recoveryPhrase.js Merge branch 'master' into ui-2 2017-05-19 14:55:13 +02:00
recoveryPhrase.spec.js UI 2 component & modal splits (#5525) 2017-04-28 11:21:05 +02:00