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

Merge branch 'master' into unittest 

Conflicts:
	sflphone-common/src/sip/sipvoiplink.cpp
parents 1acb999b 6943e0c7
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 310 additions and 72 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment