]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f906843 b04087a)
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)
* changes:
  app_confbridge.c: Update CONFBRIDGE and CONFBRIDGE_INFO documentation.
  app_confbridge: Make non-admin users join a muted conference muted.


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