Merge branch 'master' into coverage-effort

Conflicts:
	ethcore/res/ethereum/tests
This commit is contained in:
Nikolay Volf
2016-01-31 18:40:59 +04:00
71 changed files with 180 additions and 76 deletions

4
.gitmodules vendored
View File

@@ -1,4 +0,0 @@
[submodule "res/ethereum/tests"]
path = res/ethereum/tests
url = git@github.com:ethereum/tests
branch = develop