Merge "chan_pjsip: add a flag to ignore 183 responses if no SDP present" into 13

author Friendly Automation <jenkins2@gerrit.asterisk.org>

Mon, 11 Mar 2019 13:49:46 +0000 (08:49 -0500)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Mon, 11 Mar 2019 13:49:46 +0000 (08:49 -0500)
author Friendly Automation <jenkins2@gerrit.asterisk.org>
Mon, 11 Mar 2019 13:49:46 +0000 (08:49 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 11 Mar 2019 13:49:46 +0000 (08:49 -0500)
diff --cc CHANGES
Simple merge
diff --cc configs/samples/pjsip.conf.sample
Simple merge
author	Friendly Automation <jenkins2@gerrit.asterisk.org>
	Mon, 11 Mar 2019 13:49:46 +0000 (08:49 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Mon, 11 Mar 2019 13:49:46 +0000 (08:49 -0500)
		1	2
CHANGES	patch \|	diff1 \|	diff2 \|	blob \| history
configs/samples/pjsip.conf.sample	patch \|	diff1 \|	diff2 \|	blob \| history