grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into streamlined-ui

Browse Source
This commit is contained in:
Tomasz Drwięga
2016-07-12 12:06:01 +02:00
parent 986c28efb7 fbc0e0039a
commit 61c405a014
65 changed files with 879 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dapps/Cargo.toml
View File

@@ -27,7 +27,7 @@ parity-dapps-status = { git = "https://github.com/ethcore/parity-ui.git", versio
parity-dapps-home = { git = "https://github.com/ethcore/parity-ui.git", version = "0.5.2" }
parity-dapps-wallet = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6.0", optional = true }
mime_guess = { version = "1.6.1" }
clippy = { version = "0.0.78", optional = true}
clippy = { version = "0.0.79", optional = true}
[build-dependencies]
serde_codegen = { version = "0.7.0", optional = true }