diff options
| author | Christopher Brown <ccbrown112@gmail.com> | 2017-10-16 23:10:45 -0500 |
|---|---|---|
| committer | Christopher Brown <ccbrown112@gmail.com> | 2017-10-16 23:10:45 -0500 |
| commit | 39cc2372695836fdc96059d8b94992b1416f98e1 (patch) | |
| tree | 56d2beb5420cd0054194f71e53c6a95578beff9a /model | |
| parent | 89dc3cb126ba46b486997c433adfdf34982fcc81 (diff) | |
| parent | 8bf47c1211d09079fd9407555026b7b29383ac37 (diff) | |
| download | chat-39cc2372695836fdc96059d8b94992b1416f98e1.tar.gz chat-39cc2372695836fdc96059d8b94992b1416f98e1.tar.bz2 chat-39cc2372695836fdc96059d8b94992b1416f98e1.zip | |
Merge branch 'release-4.3'
Diffstat (limited to 'model')
| -rw-r--r-- | model/client.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/model/client.go b/model/client.go index 54d8fc859..37f014e6b 100644 --- a/model/client.go +++ b/model/client.go @@ -429,7 +429,7 @@ func (c *Client) UpdateTeam(team *Team) (*Result, *AppError) { } else { defer closeBody(r) return &Result{r.Header.Get(HEADER_REQUEST_ID), - r.Header.Get(HEADER_ETAG_SERVER), MapFromJson(r.Body)}, nil + r.Header.Get(HEADER_ETAG_SERVER), TeamFromJson(r.Body)}, nil } } |