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

Merge branch 'master' into networkmanager

Conflicts:
	sflphone-common/src/dbus/configurationmanager.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sip/sipaccount.cpp
	sflphone-common/src/sip/sipvoiplink.cpp
parents 739e75e6 50fc8ce2
No related branches found
No related tags found
No related merge requests found
Showing
with 160 additions and 72 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment