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

Merge branch 'contact_list' 

Conflicts:

	sflphone-gtk/src/actions.c
	sflphone-gtk/src/menus.c
	src/managerimpl.cpp
parents 9e11c564 54d9c5a0
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4352 additions and 659 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