summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-09-01 08:49:54 -0400
committerChristopher Speller <crspeller@gmail.com>2015-09-01 08:49:54 -0400
commit72575ac7bdd5bfe7bd544ba238f8d1c0126635aa (patch)
treef1ed51dfc87879e73261625f3afb4d4169e2a3f8 /model
parent0b3db018d33601a44c86d08771441c5dacd18969 (diff)
parent8d6c35481124d7e30bdb559f440c48b3e5eb4e0d (diff)
downloadchat-72575ac7bdd5bfe7bd544ba238f8d1c0126635aa.tar.gz
chat-72575ac7bdd5bfe7bd544ba238f8d1c0126635aa.tar.bz2
chat-72575ac7bdd5bfe7bd544ba238f8d1c0126635aa.zip
Merging release branch 'release-0.7.0'
Diffstat (limited to 'model')
-rw-r--r--model/user.go1
1 files changed, 0 insertions, 1 deletions
diff --git a/model/user.go b/model/user.go
index 7c53593d2..d82f96db3 100644
--- a/model/user.go
+++ b/model/user.go
@@ -333,7 +333,6 @@ func IsUsernameValid(username string) bool {
var validUsernameChars = regexp.MustCompile(`^[a-z0-9\.\-_]+$`)
var restrictedUsernames = []string{
- BOT_USERNAME,
"all",
"channel",
}