Merge topic 'ASTERISK-20987'
authorJoshua Colp <jcolp@digium.com>
Fri, 5 Feb 2016 17:49:14 +0000 (11:49 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 5 Feb 2016 17:49:15 +0000 (11:49 -0600)
* changes:
  app_confbridge: Add ability to get the muted conference state.
  app_confbridge.c: Update CONFBRIDGE and CONFBRIDGE_INFO documentation.
  app_confbridge: Make non-admin users join a muted conference muted.

1  2 
CHANGES

diff --cc CHANGES
Simple merge