]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6386a9a d45cba3)
Merge topic 'ASTERISK-20987' into certified/11.6
authorJoshua Colp <jcolp@digium.com>
Fri, 5 Feb 2016 17:50:00 +0000 (11:50 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 5 Feb 2016 17:50:01 +0000 (11:50 -0600)
* changes:
  app_confbridge: Make non-admin users join a muted conference muted.
  app_confbridge: Allow muting of users waiting to enter a ConfBridge
  app_confbridge: Fix bug - users with startmuted set don't start muted
  confbridge: Separate user muting from system muting overrides.


Trivial merge
Mirror of https://github.com/asterisk/asterisk.git