]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip WebRTC/websockets: Fix usage of WS vs WSS." into 13
authorJoshua Colp <jcolp@digium.com>
Thu, 2 Mar 2017 00:25:33 +0000 (18:25 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 2 Mar 2017 00:25:33 +0000 (18:25 -0600)
1  2 
CHANGES

diff --cc CHANGES
Simple merge