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

Merge branch 'master' into jbonjean 

Conflicts:
	sflphone-client-gnome/src/config/preferencesdialog.c
	sflphone-client-gnome/src/dbus/dbus.c
	sflphone-client-gnome/src/dbus/dbus.h
	sflphone-client-gnome/src/main.c
	sflphone-common/src/dbus/configurationmanager.cpp
parents 858c85ca db7229a5
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 9737 additions and 4395 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