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

Merge branch 'pierre-luc' 

Conflicts:
	sflphone-client-gnome/src/config/accountwindow.c
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sipvoiplink.cpp
parents 8ae44e7b 911a97d9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 41 additions and 29 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment