Jaco Greeff 7bbd48a2bd Merge branch 'master' into ui-2 ...

# Conflicts:
#	js/package.json
#	js/src/api/local/ethkey/worker.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/ui/VaultCard/Accounts/accounts.spec.js
#	js/src/views/Accounts/accounts.js
#	js/src/views/Application/TabBar/tabBar.js
#	js/src/views/Settings/Views/defaults.js
#	js/src/views/Settings/Views/views.js
#	js/webpack/app.js
#	js/webpack/libraries.js

2017-06-13 11:02:38 +02:00

..

tendermint

EIP-210 BLOCKHASH changes (#5505)

2017-05-30 11:52:33 +02:00

validator_set

Report missing author in Aura (#5583)

2017-05-22 08:21:34 +02:00

authority_round.rs

Merge branch 'master' into ui-2

2017-06-13 11:02:38 +02:00

basic_authority.rs

Merge branch 'master' into ui-2

2017-06-13 11:02:38 +02:00

epoch_verifier.rs

PoA warp implementation (#5488)

2017-05-17 12:41:33 +02:00

instant_seal.rs

EIP-86 (#4697)

2017-04-19 14:30:00 +02:00

mod.rs

Merge branch 'master' into ui-2

2017-06-13 11:02:38 +02:00

null_engine.rs

address grumbles

2017-04-24 13:14:50 +02:00

signer.rs

Optional from field in Transaction Requests (#4332)

2017-01-30 21:08:36 +01:00

transition.rs

Fix lock and rename tracing (#4403)

2017-02-02 19:11:43 +01:00

vote_collector.rs

Pass additional data when reporting (#5527)

2017-05-03 09:01:24 +02:00