]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip WebRTC/websockets: Fix usage of WS vs WSS." into 14
authorzuul <zuul@gerrit.asterisk.org>
Thu, 2 Mar 2017 00:20:23 +0000 (18:20 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 2 Mar 2017 00:20:23 +0000 (18:20 -0600)

Trivial merge