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

Merge branch 'contact_list' of... 

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

Conflicts:

	sflphone-gtk/src/mainwindow.c
parents e3f65f31 c1536c9c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 559 additions and 102 deletions
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