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

Merge branch 'm_savard' of... 

Merge branch 'm_savard' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone

Conflicts:
	sflphone-common/src/sip/sipvoiplink.cpp
parents cdda2110 18ffe1a4
No related branches found
No related tags found
Hide 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