Merge "Add missing OPTIONAL_API and ARI dependences."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Fri, 26 Jan 2018 23:40:56 +0000 (17:40 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 26 Jan 2018 23:40:56 +0000 (17:40 -0600)
1  2 
res/res_pjsip.c

diff --cc res/res_pjsip.c
Simple merge