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)
commitd2b32cd00938ed2717565c14395f10cc90875a14
treed3c31014bb906f5f116f24556745cb1c4f9f69f9
parentb62a3f0a67628e99cfceca36bafb1362788700ff
parentc0c99c7618f480656b2c2436b31ddcb6e3d9db95
Merge "chan_pjsip:  Fix ability to send UPDATE on COLP"
channels/chan_pjsip.c
res/res_pjsip.c