]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "sip_to_pjsip: Add defaultexpiry, maxexpiry, and minexpiry." into 13
authorJoshua Colp <jcolp@digium.com>
Thu, 18 Aug 2016 16:45:41 +0000 (11:45 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 18 Aug 2016 16:45:41 +0000 (11:45 -0500)

Trivial merge