summaryrefslogtreecommitdiffstats
path: root/model/user.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-09-01 08:28:03 -0400
committerChristopher Speller <crspeller@gmail.com>2015-09-01 08:28:03 -0400
commit1dddc304147c4e25abcd9d110b2c90fbcef7cc26 (patch)
treed77c6acdb24c707909e8f2313c834021b2dea2f1 /model/user.go
parenta06a07df89d83a94e875519a4e18973a6785f924 (diff)
parent7de7de6ad0882ef25ed9be5bbd91576cc822206f (diff)
downloadchat-1dddc304147c4e25abcd9d110b2c90fbcef7cc26.tar.gz
chat-1dddc304147c4e25abcd9d110b2c90fbcef7cc26.tar.bz2
chat-1dddc304147c4e25abcd9d110b2c90fbcef7cc26.zip
Merge pull request #528 from mattermost/MM-2056
HOTFIX MM-2056 fixes problem with creating team
Diffstat (limited to 'model/user.go')
-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",
}