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

2015-07-24 11:39:31 +02:00
parent 18d145cced 0f2d4bd375
commit f0e6f5bf64
2 changed files with 18 additions and 17 deletions
--- a/lib/util.py
+++ b/lib/util.py
@@ -204,6 +204,8 @@ def time_difference(distance_in_time, include_seconds):
 block_explorer_info = {
    'Biteasy.com': ('https://www.biteasy.com/blockchain',
                        {'tx': 'transactions', 'addr': 'addresses'}),
+    'Bitflyer.jp': ('https://chainflyer.bitflyer.jp',
+                        {'tx': 'Transaction', 'addr': 'Address'}),
    'Blockchain.info': ('https://blockchain.info',
                        {'tx': 'tx', 'addr': 'address'}),
    'Blockr.io': ('https://btc.blockr.io',