URI: 

       tMerge branch 'ser-master' - electrum - Electrum Bitcoin wallet
  HTML git clone https://git.parazyd.org/electrum
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
       ---
   DIR commit 275ba85595e9c78f694f10161ca7bc6840d36f76
   DIR parent 35878b437ac88bedbf49c17ea004885a7859aaa6
  HTML Author: ThomasV <thomasv@electrum.org>
       Date:   Fri, 19 Jan 2018 16:01:49 +0100
       
       Merge branch 'ser-master'
       
       Diffstat:
         M lib/commands.py                     |       6 ++++++
       
       1 file changed, 6 insertions(+), 0 deletions(-)
       ---
   DIR diff --git a/lib/commands.py b/lib/commands.py
       t@@ -672,6 +672,12 @@ class Commands:
                """ return wallet synchronization status """
                return self.wallet.is_up_to_date()
        
       +    @command('n')
       +    def getfeerate(self):
       +        """Return current optimal fee rate per kilobyte, according
       +        to config settings (static/dynamic)"""
       +        return self.config.fee_per_kb()
       +
            @command('')
            def help(self):
                # for the python console