]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "dtls: Add support for ephemeral DTLS certificates." into 15
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Mon, 6 Nov 2017 18:04:09 +0000 (12:04 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 6 Nov 2017 18:04:09 +0000 (12:04 -0600)
1  2 
res/res_pjsip.c
res/res_pjsip/pjsip_configuration.c

diff --cc res/res_pjsip.c
Simple merge
Simple merge