Merge branch 'alex1702-master' into develop

This commit is contained in:
Neil Booth 2017-01-02 17:41:21 +09:00
commit c5aa61b71b

3
.gitignore vendored
View File

@ -3,3 +3,6 @@
*.#*
*#
*~
/build
/dist
/electrumx.egg-info