]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fcba607 fb82fdb)
Merge "pjproject_bundled: Disable srtp use by pjmedia" into 13
authorzuul <zuul@gerrit.asterisk.org>
Mon, 29 Aug 2016 21:50:25 +0000 (16:50 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 29 Aug 2016 21:50:25 +0000 (16:50 -0500)

Trivial merge
Mirror of https://github.com/asterisk/asterisk.git