]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip_config_wizard: Add 2 new parameters to help with proxy config" into 14
authorzuul <zuul@gerrit.asterisk.org>
Thu, 30 Mar 2017 22:11:22 +0000 (17:11 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 30 Mar 2017 22:11:23 +0000 (17:11 -0500)

Trivial merge