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

Merge branch 'master' into m_savard 

Conflicts:

	src/Makefile.am
	src/sipvoiplink.cpp
parents 4ae62c33 fe8f19f1
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4352 additions and 659 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment