arch sync

[irc/evilnet/x3.git] / ChangeLog.X3

diff --git a/ChangeLog.X3 b/ChangeLog.X3
index 92faaf18581d572d7606f0854302317cf88a81ce..9bd6c60dddf8db2fe0f3dacdbf6070085d3fa36b 100644 (file)
--- a/ChangeLog.X3
+++ b/ChangeLog.X3
@@ -6,6 +6,7 @@
        * src/chanserv.c: added an 'adduser pending' feature, where if
        someone isn't authed x3 will ask them to /auth or register, and then
        automatically finish adding them to the channel when they do.
+       Fixed email bug with adduser pending
 
        * src/chanserv.h: adduser pending
 
@@ -13,7 +14,9 @@
 
        * src/hash.h: adduser pending, and increased maxbans to 128 from 45.
 
-       * src/nickserv.c: adduser pending cleanup and activation code
+       * src/nickserv.c: adduser pending cleanup and activation code,
+                         Arch sync (Avoid losing channel information when
+                         replacing an account using the mergedb command.)
 
        * src/proto-p10.c: adduser pending cleanup code