Merge "ari/resource_channels: Add 'formats' to channel create/originate"

author Joshua Colp <jcolp@digium.com>

Wed, 8 Jun 2016 10:13:37 +0000 (05:13 -0500)

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

Wed, 8 Jun 2016 10:13:37 +0000 (05:13 -0500)
author Joshua Colp <jcolp@digium.com>
Wed, 8 Jun 2016 10:13:37 +0000 (05:13 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 8 Jun 2016 10:13:37 +0000 (05:13 -0500)
diff --cc CHANGES
Simple merge
diff --cc res/ari/resource_channels.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Wed, 8 Jun 2016 10:13:37 +0000 (05:13 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Wed, 8 Jun 2016 10:13:37 +0000 (05:13 -0500)
		1	2
CHANGES	patch \|	diff1 \|	diff2 \|	blob \| history
res/ari/resource_channels.c	patch \|	diff1 \|	diff2 \|	blob \| history