Skip to content
Snippets Groups Projects
Commit c2a8d85f authored by Julien Bonjean's avatar Julien Bonjean
Browse files

Merge branch 'master' into contact_list

Conflicts:

	sflphone-gtk/src/searchfilter.c
parents 907219c5 2db1a485
No related branches found
No related tags found
No related merge requests found
Showing
with 950 additions and 1294 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment