Merge "chan_pjsip: Fix ability to send UPDATE on COLP"
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 5 Jul 2017 19:17:23 +0000 (14:17 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 5 Jul 2017 19:17:23 +0000 (14:17 -0500)
1  2 
channels/chan_pjsip.c
res/res_pjsip.c

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