]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "AMI PlayDTMF Action: Make not compete with channel's media thread." into 15
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Thu, 21 Jun 2018 14:09:48 +0000 (09:09 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 21 Jun 2018 14:09:48 +0000 (09:09 -0500)
1  2 
main/channel.c

diff --cc main/channel.c
Simple merge