]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Merge topic 'ASTERISK-20987' into 11
authorJoshua Colp <jcolp@digium.com>
Fri, 5 Feb 2016 17:49:04 +0000 (11:49 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 5 Feb 2016 17:49:05 +0000 (11:49 -0600)
commitcc510376ec90359276d71e05bc7a8dd35589f967
treeb876be8695d0b6aabc9b4557c774760b1e93d396
parentf9068438188712e50899d6e7b90664791315f8a0
parentb04087a8e17224388146b388c3b221fa40b11d6d
Merge topic 'ASTERISK-20987' into 11

* changes:
  app_confbridge.c: Update CONFBRIDGE and CONFBRIDGE_INFO documentation.
  app_confbridge: Make non-admin users join a muted conference muted.