]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cee5b78 5e9cd1f)
Merge "res_srtp: Add support for libsrtp2" into 13
authorJoshua Colp <jcolp@digium.com>
Tue, 6 Jun 2017 10:00:57 +0000 (05:00 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 6 Jun 2017 10:00:57 +0000 (05:00 -0500)

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