]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "bridge: stuck channel(s) after failed attended transfer" into 14
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 21 Jun 2017 22:55:03 +0000 (17:55 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 21 Jun 2017 22:55:03 +0000 (17:55 -0500)
1  2 
main/bridge.c

diff --cc main/bridge.c
Simple merge