Merge "ARI: Ability to inhibit COLP frames when adding channels to a bridge"
authorFriendly Automation <jenkins2@gerrit.asterisk.org>
Fri, 10 Jan 2020 18:03:35 +0000 (12:03 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 10 Jan 2020 18:03:35 +0000 (12:03 -0600)

Trivial merge