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

Merge branch 'master' into codecs-per-account 

Conflicts:
	sflphone-client-gnome/doc/Makefile.am
	sflphone-client-gnome/src/actions.c
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sip/sipvoiplink.cpp
parents b8f77524 d815147b
Branches
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 555 additions and 233 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment