[Pkg-bitcoin-commits] [electrum] 01/02: Merge branch 'master' into stretch-backports

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch stretch-backports
in repository electrum.

commit e0eb40186c3d8a288065fbfa02603bf9860c93c1
Merge: f79397c 01b30aa
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Feb 17 03:09:54 2018 +0200

    Merge branch 'master' into stretch-backports

 Electrum.egg-info/PKG-INFO    |     2 +-
 PKG-INFO                      |     2 +-
 RELEASE-NOTES                 |     5 +
 debian/changelog              |     7 +
 electrum                      |     3 +-
 gui/kivy/main_window.py       |     8 +-
 gui/qt/address_dialog.py      |     2 +-
 gui/qt/icons_rc.py            | 22589 ++++++++++++++++++++--------------------
 gui/qt/main_window.py         |    28 +-
 gui/qt/qrcodewidget.py        |     3 +-
 gui/stdio.py                  |    16 +-
 icons/unpaid.png              |   Bin 27679 -> 23805 bytes
 lib/commands.py               |     8 +-
 lib/exchange_rate.py          |     7 +-
 lib/mnemonic.py               |     5 +-
 lib/tests/test_transaction.py |     4 +
 lib/transaction.py            |    72 +-
 lib/version.py                |     2 +-
 lib/wallet.py                 |     3 +-
 lib/websockets.py             |    14 +-
 plugins/ledger/ledger.py      |    57 +-
 21 files changed, 11479 insertions(+), 11358 deletions(-)

diff --cc debian/changelog
index 4395127,755b5be..977aae3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ electrum (3.0.6-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - Fixes an issue with parsing some transactions.
+ 
+  -- Tristan Seligmann <mithrandi at debian.org>  Sat, 10 Feb 2018 23:25:59 +0200
+ 
 +electrum (3.0.5-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Tristan Seligmann <mithrandi at debian.org>  Sat, 13 Jan 2018 14:37:04 +0200
 +
  electrum (3.0.5-1) unstable; urgency=high
  
    * New upstream release.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/electrum.git