]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip/pjsip_transport_management.c: Fix deadlock with transport keep alive...
authorJoshua Colp <jcolp@digium.com>
Mon, 9 Jul 2018 12:10:33 +0000 (07:10 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 9 Jul 2018 12:10:33 +0000 (07:10 -0500)

Trivial merge