]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_rtp_asterisk: Add ice_blacklist option" into 14
authorzuul <zuul@gerrit.asterisk.org>
Wed, 19 Oct 2016 19:58:26 +0000 (14:58 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 19 Oct 2016 19:58:26 +0000 (14:58 -0500)

Trivial merge