Skip to content
Snippets Groups Projects
Commit e99bcfd0 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

Merge branch 'master' into presence_sip_dev

Conflicts:
	daemon/src/managerimpl.cpp
	daemon/src/sip/sipaccount.h
parents 0ba34215 0bde5fde
Branches
Tags
No related merge requests found
Showing
with 346 additions and 1185 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment