Merge "bridge_softmix.c: Report not talking immediately when muted."
authorJoshua Colp <jcolp@digium.com>
Fri, 2 Feb 2018 12:22:59 +0000 (06:22 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 2 Feb 2018 12:22:59 +0000 (06:22 -0600)
1  2 
bridges/bridge_softmix.c

Simple merge