]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip/pjsip_transport_management.c: Fix deadlock with transport keep alive...
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Mon, 9 Jul 2018 11:54:51 +0000 (06:54 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 9 Jul 2018 11:54:51 +0000 (06:54 -0500)

Trivial merge