]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "bridge: Fix stream topology/participant locking and video misrouting." into 15
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Mon, 7 Aug 2017 23:52:35 +0000 (18:52 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 7 Aug 2017 23:52:35 +0000 (18:52 -0500)

Trivial merge