Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-daemon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

1e12f8ff

Commit 1e12f8ff authored 4 years ago by Pierre Lespagnol Committed by Adrien Béraud 4 years ago

Downloads
- Patches
- Plain Diff

conference: allow merge multiple conferences

Gitlab: #409

Change-Id: Icaf85305227bc5fdbfc2a23966c1080b7e05f0fc

parent c05dfb14

Branches

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/call.cpp 3 additions, 22 deletions

src/call.cpp
src/conference.cpp 142 additions, 20 deletions

src/conference.cpp
src/conference.h 52 additions, 2 deletions

src/conference.h

with 197 additions and 44 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