Merge "res_pjsip_notify.c: enable in-dialog NOTIFY" into 15

author Jenkins2 <jenkins2@gerrit.asterisk.org>

Thu, 12 Apr 2018 20:09:26 +0000 (15:09 -0500)

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

Thu, 12 Apr 2018 20:09:26 +0000 (15:09 -0500)
author Jenkins2 <jenkins2@gerrit.asterisk.org>
Thu, 12 Apr 2018 20:09:26 +0000 (15:09 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 12 Apr 2018 20:09:26 +0000 (15:09 -0500)
diff --cc CHANGES
Simple merge
diff --cc res/res_pjsip.c
Simple merge
author	Jenkins2 <jenkins2@gerrit.asterisk.org>
	Thu, 12 Apr 2018 20:09:26 +0000 (15:09 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Thu, 12 Apr 2018 20:09:26 +0000 (15:09 -0500)
		1	2
CHANGES	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip.c	patch \|	diff1 \|	diff2 \|	blob \| history