summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-08-28 08:26:33 -0400
committerChristopher Speller <crspeller@gmail.com>2015-08-28 08:26:33 -0400
commitd107b392a6309a41eac6cd7d07d720a21968eb56 (patch)
tree3be26fed1cb5fd22d344d54ba99e93b80b5d6c93 /api
parent2bc6451e39a4080832e0b6250f536972c42b1f48 (diff)
parentf96513809f2f1ff64d8f0919c67408438713ba83 (diff)
downloadchat-d107b392a6309a41eac6cd7d07d720a21968eb56.tar.gz
chat-d107b392a6309a41eac6cd7d07d720a21968eb56.tar.bz2
chat-d107b392a6309a41eac6cd7d07d720a21968eb56.zip
Merge pull request #511 from mattermost/MM-1698
MM-1698 Fixes upgrade db from 0.6 for postgres
Diffstat (limited to 'api')
-rw-r--r--api/team.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/team.go b/api/team.go
index eaa0d2695..22a19cca8 100644
--- a/api/team.go
+++ b/api/team.go
@@ -194,7 +194,7 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) {
rteam := result.Data.(*model.Team)
if _, err := CreateDefaultChannels(c, rteam.Id); err != nil {
- c.Err = nil
+ c.Err = err
return
}