diff options
| author | Elias Nahum <nahumhbl@gmail.com> | 2016-08-09 17:05:59 -0500 |
|---|---|---|
| committer | Elias Nahum <nahumhbl@gmail.com> | 2016-08-09 17:05:59 -0500 |
| commit | 805659239098a0b382a2a8bad704c2e91ab38ed6 (patch) | |
| tree | e2c42b89d7ffc830bd9270cc65780fe470ccb4f4 /webapp/actions | |
| parent | 7be82c2b279390d3659fbe74c7d3ccabc48a6dd8 (diff) | |
| parent | ac2f75ac8fd4e2d7ae1de6703a156b9636d4b8f0 (diff) | |
| download | chat-805659239098a0b382a2a8bad704c2e91ab38ed6.tar.gz chat-805659239098a0b382a2a8bad704c2e91ab38ed6.tar.bz2 chat-805659239098a0b382a2a8bad704c2e91ab38ed6.zip | |
Merge branch 'release-3.3' RC3
Diffstat (limited to 'webapp/actions')
| -rw-r--r-- | webapp/actions/websocket_actions.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx index e93b2d25b..9150e4111 100644 --- a/webapp/actions/websocket_actions.jsx +++ b/webapp/actions/websocket_actions.jsx @@ -32,7 +32,7 @@ const MAX_WEBSOCKET_FAILS = 7; export function initialize() { if (window.WebSocket) { - let connUrl = window.mm_config.SiteURL; + let connUrl = Utils.getSiteURL(); // replace the protocol with a websocket one if (connUrl.startsWith('https:')) { |