Merge "res/ari/resource_bridges: Add the ability to manipulate the video source"

author zuul <zuul@gerrit.asterisk.org>

Wed, 16 Nov 2016 22:48:09 +0000 (16:48 -0600)

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

Wed, 16 Nov 2016 22:48:09 +0000 (16:48 -0600)
author zuul <zuul@gerrit.asterisk.org>
Wed, 16 Nov 2016 22:48:09 +0000 (16:48 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 16 Nov 2016 22:48:09 +0000 (16:48 -0600)
diff --cc CHANGES
Simple merge
diff --cc res/ari/ari_model_validators.c
Simple merge
diff --cc res/ari/ari_model_validators.h
Simple merge
author	zuul <zuul@gerrit.asterisk.org>
	Wed, 16 Nov 2016 22:48:09 +0000 (16:48 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Wed, 16 Nov 2016 22:48:09 +0000 (16:48 -0600)
		1	2
CHANGES	patch \|	diff1 \|	diff2 \|	blob \| history
res/ari/ari_model_validators.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/ari/ari_model_validators.h	patch \|	diff1 \|	diff2 \|	blob \| history