From: Joshua Colp <jcolp@digium.com>
Date: Wed, 1 Mar 2017 23:24:43 +0000 (-0600)
Subject: Merge "res_pjsip WebRTC/websockets: Fix usage of WS vs WSS."
X-Git-Tag: 15.0.0-beta1~296
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9b2360d17f744cb8993672977e2688ab3491ae2;p=thirdparty%2Fasterisk.git

Merge "res_pjsip WebRTC/websockets: Fix usage of WS vs WSS."
---

e9b2360d17f744cb8993672977e2688ab3491ae2