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

Merge branch 'master' into jbonjean 

Conflicts:
	sflphone-client-gnome/src/main.c
	sflphone-client-gnome/src/sflphone_const.h
parents 64afdd4e 94affc53
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 390 additions and 29 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