Jelajahi Sumber

Merge branch 'master' into next

* master:
Bryan Drewery 8 tahun lalu
induk
melakukan
260e7822c3
1 mengubah file dengan 2 tambahan dan 2 penghapusan
  1. 2 2
      doc/UPDATES.md

+ 2 - 2
doc/UPDATES.md

@@ -1,6 +1,4 @@
 # next
 # next
-  * Add 'chanset homechan-user [nothing/voice/op]' to auto-voice or auto-op
-    clients who are opped in 'set homechan'.
 
 
 # master
 # master
   * Require C++11 compiler support (G++ 4.7+, clang32+)
   * Require C++11 compiler support (G++ 4.7+, clang32+)
@@ -11,6 +9,8 @@
     will properly assign roles out to bots to not cause overlap. Only leaf
     will properly assign roles out to bots to not cause overlap. Only leaf
     bots know which bots have which roles. (#39)
     bots know which bots have which roles. (#39)
   * Add cmd_roles (leaf only) to display roles for a channel. (#39)
   * Add cmd_roles (leaf only) to display roles for a channel. (#39)
+  * Add 'chanset homechan-user [nothing/voice/op]' to auto-voice or auto-op
+    clients who are opped in 'set homechan'.
 
 
 # maint
 # maint
   * Clear FiSH keys when a client quits.
   * Clear FiSH keys when a client quits.