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

Merge branch 'master' of git+ssh://repos-sflphone-git@sflphone.org/~/sflphone 

Conflicts:
	sflphone-client-gnome/src/contacts/searchbar.c
parents 7b17b1bd aa22ffed
No related branches found
No related tags found
No related merge requests found
Show 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