Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

asterisk
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

b0e4ea96

Commit b0e4ea96 authored 8 years ago by Joshua Colp Committed by Gerrit Code Review 8 years ago

Downloads
- Plain Diff

Merge "Bridging: introduce "invisible" bridges."

parents d1ab0936 f6c33771

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

include/asterisk/bridge_features.h 2 additions, 0 deletions

include/asterisk/bridge_features.h
main/bridge.c 14 additions, 10 deletions

main/bridge.c
main/manager_bridges.c 1 addition, 1 deletion

main/manager_bridges.c
main/stasis_bridges.c 13 additions, 0 deletions

main/stasis_bridges.c
main/stasis_channels.c 3 additions, 1 deletion

main/stasis_channels.c

with 33 additions and 12 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment