From 96b930f0f25dcb9ec0534daec51c124991895da3 Mon Sep 17 00:00:00 2001 From: Jonathan Zeppettini Date: Wed, 24 Feb 2016 15:19:05 -0500 Subject: [PATCH 1/3] Update README.rst Removed reference to non existent page... --- README.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.rst b/README.rst index 3419d917..5985cd56 100644 --- a/README.rst +++ b/README.rst @@ -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 ------------------------------------ From 57dba2fd1f4327bd18329161684d2074c611410c Mon Sep 17 00:00:00 2001 From: ThomasV Date: Sat, 27 Feb 2016 08:31:09 +0100 Subject: [PATCH 2/3] update make_download script --- contrib/make_download | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/contrib/make_download b/contrib/make_download index b91a65fd..c446aa75 100755 --- a/contrib/make_download +++ b/contrib/make_download @@ -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) From 76bf8085fd35e3ea6ed0ceb9c81ca4c31014e3b1 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Sun, 28 Feb 2016 05:18:50 +0100 Subject: [PATCH 3/3] fix #1688 --- lib/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/commands.py b/lib/commands.py index f5a3ae27..ea65d65b 100644 --- a/lib/commands.py +++ b/lib/commands.py @@ -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):