diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-02 22:26:28 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-02 22:26:28 +0500 |
| commit | d8c5c4f7468bb07d8de904437726557c6fa9b436 (patch) | |
| tree | c19af28e1ad6c2bf068bf64956461c25502f9bb3 /model/client.go | |
| parent | 813792dd600f4e485d52cc1066a8c1297578432d (diff) | |
| parent | 41069d83d2b6ad5cca599f75292027e13d5b10f7 (diff) | |
| download | chat-d8c5c4f7468bb07d8de904437726557c6fa9b436.tar.gz chat-d8c5c4f7468bb07d8de904437726557c6fa9b436.tar.bz2 chat-d8c5c4f7468bb07d8de904437726557c6fa9b436.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into plt-375
Conflicts:
web/react/components/user_settings/user_settings_appearance.jsx
Diffstat (limited to 'model/client.go')
| -rw-r--r-- | model/client.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/model/client.go b/model/client.go index 26e00864d..a291cc4f2 100644 --- a/model/client.go +++ b/model/client.go @@ -450,8 +450,8 @@ func (c *Client) UpdateChannelDesc(data map[string]string) (*Result, *AppError) } } -func (c *Client) UpdateNotifyLevel(data map[string]string) (*Result, *AppError) { - if r, err := c.DoApiPost("/channels/update_notify_level", MapToJson(data)); err != nil { +func (c *Client) UpdateNotifyProps(data map[string]string) (*Result, *AppError) { + if r, err := c.DoApiPost("/channels/update_notify_props", MapToJson(data)); err != nil { return nil, err } else { return &Result{r.Header.Get(HEADER_REQUEST_ID), |