Merge "res_rtp_asterisk / res_pjsip: Add support for BUNDLE."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Thu, 13 Jul 2017 19:40:11 +0000 (14:40 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 13 Jul 2017 19:40:11 +0000 (14:40 -0500)
1  2 
channels/chan_pjsip.c
include/asterisk/rtp_engine.h
res/res_pjsip.c
res/res_pjsip/pjsip_configuration.c
res/res_rtp_asterisk.c

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