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
..
blockchain	Fix whitespace (#4299)	2017-01-25 18:51:41 +01:00
misc	Proper default accounts RPCs (#4580)	2017-02-20 16:33:12 +01:00
spec	Merge branch 'master' into ui-2	2017-06-13 11:02:38 +02:00
state	EIP-86 (#4697)	2017-04-19 14:30:00 +02:00
transaction	Fix whitespace (#4299)	2017-01-25 18:51:41 +01:00
trie	Serde 0.9 (#4508)	2017-02-13 18:38:47 +03:00
vm	Fix whitespace (#4299)	2017-01-25 18:51:41 +01:00
bytes.rs	Serde 0.9 (#4508)	2017-02-13 18:38:47 +03:00
hash.rs	Updating JSON-RPC crates (#4934)	2017-03-22 07:02:14 +01:00
lib.rs	Serde 0.9 (#4508)	2017-02-13 18:38:47 +03:00
maybe.rs	New state tests (#5418)	2017-04-12 13:33:49 +02:00
uint.rs	Update dependencies and bigint api (#5685)	2017-05-24 12:31:33 +02:00