Jaco Greeff d852e6b063 Merge branch 'master' into ui-2 ... # Conflicts: # js/src/views/Signer/components/SignRequest/signRequest.js		2017-10-17 09:55:13 +02:00
..
account.js	Merge master	2017-09-07 13:32:45 +02:00
accounts.js	Merge master	2017-09-07 13:32:45 +02:00
addAddress.js
addContract.js
address.js
addresses.js
addressSelect.js
application.js	Merge master	2017-09-07 13:32:45 +02:00
connection.js	Merge master	2017-09-07 13:32:45 +02:00
contract.js
contracts.js
createAccount.js	Merge master	2017-09-07 13:32:45 +02:00
createWallet.js	Merge master	2017-09-07 13:32:45 +02:00
dapp.js
dapps.js	Merge master	2017-09-07 13:32:45 +02:00
deleteAccount.js
deployContract.js	Merge master	2017-09-07 13:32:45 +02:00
details_windows.js
editMeta.js
errors.js	Merge master	2017-09-07 13:32:45 +02:00
executeContract.js	Merge master	2017-09-07 13:32:45 +02:00
extension.js
faucet.js
firstRun.js	Merge master	2017-09-07 13:32:45 +02:00
home.js
index.js	Merge master	2017-09-07 13:32:45 +02:00
loadContract.js
parityBar.js
passwordChange.js
peers.js	Merge master	2017-09-07 13:32:45 +02:00
requests.js	Merge master	2017-09-07 13:32:45 +02:00
saveContract.js
settings.js	Merge branch 'master' into ui-2	2017-10-09 10:23:21 +02:00
shapeshift.js
signer.js	Merge branch 'master' into ui-2	2017-10-17 09:55:13 +02:00
status.js	Merge master	2017-09-07 13:32:45 +02:00
syncWarning.js	Merge master	2017-09-07 13:32:45 +02:00
tabBar.js
transfer.js	Merge master	2017-09-07 13:32:45 +02:00
txEditor.js
ui.js	Merge master	2017-09-07 13:32:45 +02:00
upgradeParity.js
vaults.js
verification.js
wallet.js
walletSettings.js	Merge master	2017-09-07 13:32:45 +02:00
web.js
writeContract.js	Merge master	2017-09-07 13:32:45 +02:00