diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-18 12:23:02 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-18 12:23:02 -0700 |
| commit | 19e9a4121820a1ad124a4189837c8c4088c33439 (patch) | |
| tree | 29fa0399d83a9b8849bd5eae4396fa6f620112da /model/utils.go | |
| parent | 9d582a5a7ad758a10f456d769f020ac0b7933c16 (diff) | |
| parent | aee643e20c8e8350a1137aa69e164218fe5a33f1 (diff) | |
| download | chat-19e9a4121820a1ad124a4189837c8c4088c33439.tar.gz chat-19e9a4121820a1ad124a4189837c8c4088c33439.tar.bz2 chat-19e9a4121820a1ad124a4189837c8c4088c33439.zip | |
Merge pull request #11 from mattermost/master
to me
Diffstat (limited to 'model/utils.go')
| -rw-r--r-- | model/utils.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/model/utils.go b/model/utils.go index 8b597000a..2541247de 100644 --- a/model/utils.go +++ b/model/utils.go @@ -160,6 +160,7 @@ var reservedDomains = []string{ "channel", "internal", "localhost", + "dockerhost", "stag", "post", "cluster", |