Skip to content
Snippets Groups Projects
Commit 2e705288 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'master' into conference 

Conflicts:
	sflphone-common/src/sip/sipvoiplink.cpp
parents 64ce4857 b59ddff3
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment