Merge "res/res_ari: Added timestamp as a requirement for all ARI events"

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

Tue, 26 Mar 2019 13:32:28 +0000 (08:32 -0500)

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

Tue, 26 Mar 2019 13:32:28 +0000 (08:32 -0500)
author Friendly Automation <jenkins2@gerrit.asterisk.org>
Tue, 26 Mar 2019 13:32:28 +0000 (08:32 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 26 Mar 2019 13:32:28 +0000 (08:32 -0500)
diff --cc res/res_stasis.c
Simple merge
diff --cc res/stasis/app.c
Simple merge
author	Friendly Automation <jenkins2@gerrit.asterisk.org>
	Tue, 26 Mar 2019 13:32:28 +0000 (08:32 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Tue, 26 Mar 2019 13:32:28 +0000 (08:32 -0500)
		1	2
res/res_stasis.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/stasis/app.c	patch \|	diff1 \|	diff2 \|	blob \| history