]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip/pjsip_options: Fix From generation on outgoing OPTIONS"
authorzuul <zuul@gerrit.asterisk.org>
Wed, 30 Mar 2016 15:51:42 +0000 (10:51 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 30 Mar 2016 15:51:42 +0000 (10:51 -0500)
1  2 
res/res_pjsip.c
res/res_pjsip/pjsip_options.c

diff --cc res/res_pjsip.c
Simple merge
Simple merge