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

Merge branch 'master' into contact_list 

Conflicts:

	sflphone-gtk/src/mainwindow.c
parents b9f8673f 2e8b6d44
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 613 additions and 290 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