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

Merge branch 'm_savard' 

Conflicts:
	sflphone-client-gnome/src/contacts/calltree.c
parents 9984bb63 aa2a296e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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