]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip: Fix deadlock on reliable transport shutdown." into 15
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 18 Apr 2018 22:34:25 +0000 (17:34 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 18 Apr 2018 22:34:25 +0000 (17:34 -0500)
1  2 
res/res_pjsip_outbound_registration.c
res/res_pjsip_pubsub.c

Simple merge
Simple merge