]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26a2cd3 04490fb)
Merge "json: Add conditionals to avoid locking if Jansson is thread safe."
authorJoshua Colp <jcolp@digium.com>
Tue, 13 Feb 2018 13:30:35 +0000 (07:30 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 13 Feb 2018 13:30:35 +0000 (07:30 -0600)

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