Merge branch 'master' into update-claim

This commit is contained in:
Jack 2016-08-08 21:39:41 -04:00
commit 7ad0d98404

View file

@ -9,7 +9,6 @@ gmpy==1.17
jsonrpc==1.2 jsonrpc==1.2
jsonrpclib==0.1.7 jsonrpclib==0.1.7
https://github.com/lbryio/lbryum/tarball/master/#egg=lbryum https://github.com/lbryio/lbryum/tarball/master/#egg=lbryum
leveldb==0.193
miniupnpc==1.9 miniupnpc==1.9
pbkdf2==1.3 pbkdf2==1.3
protobuf==3.0.0b3 protobuf==3.0.0b3
@ -26,4 +25,4 @@ unqlite==0.2.0
wsgiref==0.1.2 wsgiref==0.1.2
zope.interface==4.1.3 zope.interface==4.1.3
base58==0.2.2 base58==0.2.2
googlefinance==0.7 googlefinance==0.7