]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "sample_config: Add samples for pubsub to pjsip.conf.sample" into 13
authorJoshua Colp <jcolp@digium.com>
Thu, 6 Apr 2017 13:29:43 +0000 (08:29 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 6 Apr 2017 13:29:43 +0000 (08:29 -0500)

Trivial merge