]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "bridge_softmix: Forward TEXT frames" into 15
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Thu, 26 Apr 2018 20:12:54 +0000 (15:12 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 26 Apr 2018 20:12:54 +0000 (15:12 -0500)
1  2 
bridges/bridge_softmix.c

Simple merge