diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-18 08:47:35 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-18 08:47:35 -0400 |
| commit | 2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218 (patch) | |
| tree | 1de5578c9050a33635960fc046fdf97339254be0 /web/react/utils/async_client.jsx | |
| parent | 96d1eb1c800a427e31e63970e57d0824a3bc91e3 (diff) | |
| parent | a7f09be9783f3354ab38d4fb4fb82085241d018f (diff) | |
| download | chat-2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218.tar.gz chat-2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218.tar.bz2 chat-2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218.zip | |
Merge pull request #381 from mattermost/mm-1705
MM-1705 add google as an oauth single-sign-on service
Diffstat (limited to 'web/react/utils/async_client.jsx')
| -rw-r--r-- | web/react/utils/async_client.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx index 0b87bbd7b..8b6d821d6 100644 --- a/web/react/utils/async_client.jsx +++ b/web/react/utils/async_client.jsx @@ -396,7 +396,7 @@ function getMe() { } callTracker.getMe = utils.getTimestamp(); - client.getMe( + client.getMeSynchronous( function(data, textStatus, xhr) { callTracker.getMe = 0; |