]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip: Add 'ip' as a valid option to 'identify_by' on endpoint." into 15
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Thu, 26 Oct 2017 23:27:31 +0000 (18:27 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 26 Oct 2017 23:27:31 +0000 (18:27 -0500)

Trivial merge