]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "stasis: Fix ABI between DEVMODE and non-DEVMODE." into 16
authorFriendly Automation <jenkins2@gerrit.asterisk.org>
Thu, 3 Jan 2019 23:39:18 +0000 (17:39 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 3 Jan 2019 23:39:18 +0000 (17:39 -0600)
1  2 
main/stasis.c

diff --cc main/stasis.c
Simple merge