Merge https://github.com/sbp/phenny

Conflicts: modules/head.py modules/wikipedia.py
2011-09-07 19:08:01 -04:00
parent 4b6ebf0f21 2d3009ccb1
commit b9c2193eb2
8 changed files with 99 additions and 27 deletions
--- a/4
+++ b/4
@@ -32,7 +32,9 @@ def create_default_config(fn):
   channels = ['#example', '#test']
   owner = 'yournickname'

-   # password = 'yourserverpassword'
+   # password is the NickServ password, serverpass is the server password
+   # password = 'example'
+   # serverpass = 'serverpass'

   # These are people who will be able to use admin.py's functions...
   admins = [owner, 'someoneyoutrust']