Merge "res_pjsip: Add AMI action 'PJSIPShowContacts'"
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 24 Jan 2018 13:56:50 +0000 (07:56 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 24 Jan 2018 13:56:50 +0000 (07:56 -0600)
1  2 
res/res_pjsip.c

diff --cc res/res_pjsip.c
Simple merge