]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip_transport_websocket: Add support for IPv6." into 14
authorJoshua Colp <jcolp@digium.com>
Wed, 15 Mar 2017 01:06:48 +0000 (20:06 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 15 Mar 2017 01:06:48 +0000 (20:06 -0500)

Trivial merge