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

Merge branch 'master' into m_savard

Conflicts:
	sflphone-client-gnome/src/contacts/searchbar.c
parents d4bc83e3 d61d0c0f
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment