summaryrefslogtreecommitdiff
path: root/docs/Changes.conf
diff options
context:
space:
mode:
authorNaram Qashat <cyberbotx@cyberbotx.com>2010-06-20 18:51:03 -0400
committerNaram Qashat <cyberbotx@cyberbotx.com>2010-06-20 18:51:03 -0400
commit63d7bee2a65c6d389219e5bc09d0fdf4f357b9a1 (patch)
tree595c9c0d05539b7418b04595e231665479a2d2b0 /docs/Changes.conf
parent381c9c8870fad4c544f29deec22ba4be3549a731 (diff)
parente8a1570ed9f7b839a361169c141956978348acf8 (diff)
Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
Conflicts: include/config.h
Diffstat (limited to 'docs/Changes.conf')
-rw-r--r--docs/Changes.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/Changes.conf b/docs/Changes.conf
index e4ee68fd0..cb613c434 100644
--- a/docs/Changes.conf
+++ b/docs/Changes.conf
@@ -17,6 +17,7 @@ operserv:killonsgline changed to operserv:killonsnline
operserv:notifications ossgline changed ossnline
** DELETED CONFIGURATION DIRECTIVES **
+serverinfo:helpchannel removed because it has been readded in m_helpchan
Anope Version 1.9.2
--------------------