summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authordumpfmprod <dumpfmprod@ubuntu.(none)>2010-05-17 12:01:04 -0400
committerdumpfmprod <dumpfmprod@ubuntu.(none)>2010-05-17 12:01:04 -0400
commita56999f4bfc6d12c34f9fb7201b6f86e537a5207 (patch)
treef7d4620442b928261127012c29260cd40f8a7b40 /docs
parent2439fbecf91c813c2f560ee2e45f25dfa7c01633 (diff)
parentf3d4f45db32c105e5c700668eb420f4d3709cbf3 (diff)
Merge branch 'master' of /pichat/repo
Diffstat (limited to 'docs')
-rw-r--r--docs/reserved_nicks.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/reserved_nicks.txt b/docs/reserved_nicks.txt
index 4e0312e..eef8023 100644
--- a/docs/reserved_nicks.txt
+++ b/docs/reserved_nicks.txt
@@ -56,6 +56,8 @@ post
privacy
refresh
reset
+room
+rooms
search
shop
tag