Jaco Greeff 121b742482 Merge branch 'master' into ui-2 ...

# Conflicts:
#	Cargo.lock
#	ethcore/src/evm/instructions.rs
#	js/package.json
#	js/src/modals/CreateAccount/AccountDetails/accountDetails.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/views/Accounts/accounts.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-14 10:16:42 +02:00

..

light

Update dependencies and bigint api (#5685)

2017-05-24 12:31:33 +02:00

native_contracts

Update Cid/multihash/ring/tinykeccak (#5785)

2017-06-07 12:31:12 +02:00

res

Merge branch 'master' into ui-2

2017-05-30 13:43:38 +02:00

src

Adding missing documentation. (#5821)

2017-06-13 18:38:10 +03:00

build.rs

Fix whitespace (#4299)

2017-01-25 18:51:41 +01:00

Cargo.toml

Update Cid/multihash/ring/tinykeccak (#5785)

2017-06-07 12:31:12 +02:00