]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "Build System: Resolve conflict between DESTDIR and bundled jansson."
authorJoshua Colp <jcolp@digium.com>
Wed, 12 Sep 2018 22:19:24 +0000 (17:19 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 12 Sep 2018 22:19:24 +0000 (17:19 -0500)

Trivial merge