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

Merge branch 'master' into fix_account_crasher 

Resolved Conflicts:
	daemon/src/sip/sipvoiplink.cpp
parents 3cdd72a2 705a931a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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