]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "features, manager : Add CancelAtxfer AMI action" into 14
authorJoshua Colp <jcolp@digium.com>
Fri, 13 Oct 2017 12:51:05 +0000 (07:51 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 13 Oct 2017 12:51:05 +0000 (07:51 -0500)

Trivial merge