Merge "res_pjsip: Add fax_detect_timeout endpoint option."
authorJoshua Colp <jcolp@digium.com>
Thu, 21 Jul 2016 23:25:47 +0000 (18:25 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 21 Jul 2016 23:25:47 +0000 (18:25 -0500)
1  2 
res/res_pjsip.c

diff --cc res/res_pjsip.c
Simple merge