diff options
| author | Adam <Adam@anope.org> | 2014-05-28 12:11:45 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2014-05-28 12:22:39 -0400 |
| commit | f97e339314257fa37cfcab0c2289fb6812e32e85 (patch) | |
| tree | a1c9d352a771e0bb7d39d42178a7246d6f2c5434 /data | |
| parent | f29e1cf383529a1a29f02b0669d973f5ee0b7a66 (diff) | |
| parent | ba46b8e4abd8fef991732d5c52c858a229894a25 (diff) | |
Merge branch '2.0' into 2.1
Conflicts:
.travis.yml
src/config.cpp
src/version.sh
Diffstat (limited to 'data')
| -rw-r--r-- | data/nickserv.example.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf index a53a7146b..87804e0fa 100644 --- a/data/nickserv.example.conf +++ b/data/nickserv.example.conf @@ -102,6 +102,7 @@ module * - hide_quit: Hide's the nick's last quit message * - memo_signon: Notify user if they have a new memo when they sign into the nick * - memo_receive: Notify user if they have a new memo as soon as it's received + * - memo_mail: Notify user if they have a new memo by mail * - autoop: User will be automatically opped in channels they enter and have access to * - msg: Services messages will be sent as PRIVMSGs instead of NOTICEs, requires * options:useprivmsg to be enabled as well |