Skip to content
Snippets Groups Projects
Commit 4623ec00 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'm_savard' into codecs-per-account

Conflicts:
	sflphone-common/src/sip/sdp.cpp
	sflphone-common/src/sip/sipvoiplink.cpp
parents 664078bf cf6a10c2
No related branches found
No related tags found
No related merge requests found
Showing
with 1165 additions and 112 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment