]> git.ipfire.org Git - thirdparty/asterisk.git/commit
projects / thirdparty / asterisk.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3b426a8 7932336)
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)
commite541d9cf34ad32af697ca222191f60261e26a5c7
tree2793a92d2223f372cbfb247aac0d2df37e601f50tree
parent3b426a8b09c127941b29600271184583f2199a19commit | diff
parent7932336a3d1e09ee88b8416ebc1abbdb8692660acommit | diff
Merge topic 'ASTERISK-20987'

* 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.
CHANGES diff1 | diff2 | blob | history
Mirror of https://github.com/asterisk/asterisk.git