]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "app_confbridge: Make non-admin users join a muted conference muted." into...
authorJoshua Colp <jcolp@digium.com>
Fri, 5 Feb 2016 17:49:18 +0000 (11:49 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 5 Feb 2016 17:49:19 +0000 (11:49 -0600)

Trivial merge