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
accounts.js
addAddress.js
addContract.js
address.js
addresses.js
addressSelect.js
application.js
connection.js
contract.js
contracts.js
createAccount.js
createWallet.js
dapp.js
dapps.js
deleteAccount.js
deployContract.js
details_windows.js
editMeta.js
errors.js
executeContract.js
extension.js
faucet.js
firstRun.js
home.js
index.js
loadContract.js
parityBar.js
passwordChange.js
peers.js
requests.js
saveContract.js
settings.js
shapeshift.js
signer.js	Merge branch 'master' into ui-2	2017-10-17 09:55:13 +02:00
status.js
syncWarning.js
tabBar.js
transfer.js
txEditor.js
ui.js
upgradeParity.js
vaults.js
verification.js
wallet.js
walletSettings.js
web.js
writeContract.js