Bläddra i källkod

Merge branch 'master' into next

* master:
  * Update docs
Bryan Drewery 14 år sedan
förälder
incheckning
2445da36f2
1 ändrade filer med 2 tillägg och 0 borttagningar
  1. 2 0
      doc/help.txt

+ 2 - 0
doc/help.txt

@@ -417,6 +417,8 @@ See also: link%{+a}, newhub%{-}
  
  
         $bflood-lock-time$b   How long in seconds to keep the channel locked
         $bflood-lock-time$b   How long in seconds to keep the channel locked
                          during drone floods.
                          during drone floods.
+        $bfish-key$b          The key to use for FiSH encryption. Use '{ key }'
+                          to set and '{}' to unset.
  
  
         $binvite-time$b       Set here how long temporary invites will last (in
         $binvite-time$b       Set here how long temporary invites will last (in
                           minutes). If you set this setting to 0, the bot will
                           minutes). If you set this setting to 0, the bot will