Skip to content
Snippets Groups Projects
Commit 1ca78965 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'master' into conference 

Conflicts:
	sflphone-client-gnome/pixmaps/usersActive.svg
	sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
	sflphone-common/src/dbus/callmanager.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sip/sipvoiplink.cpp
parents 19aa800c 71007b4f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1080 additions and 897 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment