Merge branch 'master' of git://github.com/spesmilo/electrum

This commit is contained in:
ThomasV 2014-04-17 17:05:45 +02:00
commit 3e1a87397d

View file

@ -677,7 +677,7 @@ def bip32_private_key(sequence, k, chain):
################################## transactions ################################## transactions
MIN_RELAY_TX_FEE = 10000 MIN_RELAY_TX_FEE = 1000