summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorsostler <sbostler@gmail.com>2010-05-20 20:37:48 -0400
committersostler <sbostler@gmail.com>2010-05-20 20:37:48 -0400
commitd9e888278950e6fc4f151aa782685023ab9b05cc (patch)
treebf99d29446007c567b524189f5b863722ff4acbc /docs
parent7cd97594cf46bb942d07099ffb05fcbceb609e9b (diff)
parent8178d640398c2b596b9dddfa3b159d1e23881952 (diff)
Merge branch 'master' of ssh://dump.fm/pichat/repo
Diffstat (limited to 'docs')
-rw-r--r--docs/reserved_nicks.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/reserved_nicks.txt b/docs/reserved_nicks.txt
index 6955429..443cb1c 100644
--- a/docs/reserved_nicks.txt
+++ b/docs/reserved_nicks.txt
@@ -38,6 +38,7 @@ iphone
jobs
json
legal
+library
links
live
log