Merge branch 'master' of github.com:spesmilo/electrum
This commit is contained in:
commit
c1609d0ca7
|
@ -37,11 +37,6 @@ If you don't have pip, install with::
|
|||
|
||||
|
||||
|
||||
To start Electrum from your web browser, see
|
||||
http://electrum.org/bitcoin_URIs.html
|
||||
|
||||
|
||||
|
||||
2. HOW OFFICIAL PACKAGES ARE CREATED
|
||||
------------------------------------
|
||||
|
||||
|
|
|
@ -49,15 +49,3 @@ with open(download_page,'w') as f:
|
|||
f.write(string)
|
||||
|
||||
|
||||
# android
|
||||
|
||||
from versions import android_template, android_page
|
||||
with open(android_template) as f:
|
||||
string = f.read()
|
||||
|
||||
e4a_zipname = "e4a-%s.zip"%version
|
||||
string = string.replace("##VERSION##", version)
|
||||
string = string.replace("##ZIPNAME##", e4a_zipname)
|
||||
|
||||
with open(android_page,'w') as f:
|
||||
f.write(string)
|
||||
|
|
|
@ -233,7 +233,7 @@ class Commands:
|
|||
def broadcast(self, tx, timeout=10):
|
||||
"""Broadcast a transaction to the network. """
|
||||
t = Transaction(tx)
|
||||
return self.network.broadcast(str(t), timeout)
|
||||
return self.network.broadcast(t, timeout)
|
||||
|
||||
@command('')
|
||||
def createmultisig(self, num, pubkeys):
|
||||
|
|
Loading…
Reference in New Issue