Skip to content
Snippets Groups Projects
Commit 61ff2745 authored by pierre-luc's avatar pierre-luc
Browse files

Merge branch 'pierre-luc' into pierre-luc-0.9.7 

Conflicts:
	sflphone-common/src/dbus/configurationmanager.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/user_cfg.h

Update to the current, non-zrtp branch. Still lacks of ZRTP interaction
within the UI.
parents e2cb9ffd cd4ef84c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 427 additions and 211 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