]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip_pubsub.c: Fix body generator registration race."
authorJoshua Colp <jcolp@digium.com>
Fri, 29 Apr 2016 18:33:43 +0000 (13:33 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 29 Apr 2016 18:33:43 +0000 (13:33 -0500)
1  2 
res/res_pjsip_pubsub.c

Simple merge