]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip_sdp_rtp: Reject offer of required SRTP without res_srtp." into 13
authorJoshua Colp <jcolp@digium.com>
Fri, 11 Nov 2016 21:17:54 +0000 (15:17 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 11 Nov 2016 21:17:55 +0000 (15:17 -0600)

Trivial merge