]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "bridge_softmix.c: Fix crash if channel fails to join mixing tech."
authorzuul <zuul@gerrit.asterisk.org>
Tue, 26 Apr 2016 02:08:15 +0000 (21:08 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 26 Apr 2016 02:08:15 +0000 (21:08 -0500)
1  2 
main/bridge.c

diff --cc main/bridge.c
Simple merge