Merge "main/json.c: Added app_name, app_data to channel type"

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

Mon, 8 Apr 2019 15:32:16 +0000 (10:32 -0500)

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

Mon, 8 Apr 2019 15:32:16 +0000 (10:32 -0500)
author Friendly Automation <jenkins2@gerrit.asterisk.org>
Mon, 8 Apr 2019 15:32:16 +0000 (10:32 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 8 Apr 2019 15:32:16 +0000 (10:32 -0500)
diff --cc res/ari/ari_model_validators.c
Simple merge
diff --cc res/ari/ari_model_validators.h
Simple merge
author	Friendly Automation <jenkins2@gerrit.asterisk.org>
	Mon, 8 Apr 2019 15:32:16 +0000 (10:32 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Mon, 8 Apr 2019 15:32:16 +0000 (10:32 -0500)
		1	2
res/ari/ari_model_validators.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/ari/ari_model_validators.h	patch \|	diff1 \|	diff2 \|	blob \| history