diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-04-28 17:03:59 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-04-28 17:03:59 -0700 |
| commit | 62901defaebb8f3524bdfcad86b2576cfd9fe587 (patch) | |
| tree | b0740451c56c68c5284834fd02bbce4d831acc17 /webapp/client/client.jsx | |
| parent | ad9dfc9c42b6597515d9eb0a96e9f069372dffdd (diff) | |
| parent | f3fa435a1b35c2ada4cd9a81744a41904fe97909 (diff) | |
| download | chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.gz chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.bz2 chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.zip | |
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'webapp/client/client.jsx')
| -rw-r--r-- | webapp/client/client.jsx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/webapp/client/client.jsx b/webapp/client/client.jsx index 53a514082..6a7c5de40 100644 --- a/webapp/client/client.jsx +++ b/webapp/client/client.jsx @@ -348,10 +348,9 @@ export default class Client { importSlack = (fileData, success, error) => { request. - post(`${this.getTeamsRoute()}/import_team`). + post(`${this.getTeamNeededRoute()}/import_team`). set(this.defaultHeaders). - type('application/json'). - accept('application/json'). + accept('application/octet-stream'). send(fileData). end(this.handleResponse.bind(this, 'importSlack', success, error)); } |