Merge "pjsip_options: contacts sometimes not being updated on reload"
authorKevin Harwell <kharwell@digium.com>
Wed, 13 Dec 2017 22:50:56 +0000 (16:50 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 13 Dec 2017 22:50:56 +0000 (16:50 -0600)
1  2 
res/res_pjsip/pjsip_options.c

Simple merge