Merge branch 'master' of github.com:ethereum/go-ethereum

Former-commit-id: 64a62da53a5878450d6115fbc7fec6eeb70c7c2c [formerly 2a2a46b57a6a62b13689578cfcd33c8b8bf0529f]
Former-commit-id: 58cdafb64755ab12a765d2156a8eab468989f3a4
This commit is contained in:
Preston Van Loon
2018-04-06 20:06:43 -04:00
65 changed files with 582 additions and 847 deletions

1
.gitattributes vendored
View File

@@ -1,2 +1,3 @@
# Auto detect text files and perform LF normalization
* text=auto
*.sol linguist-language=Solidity