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

Merge branch 'master' into sipregistration

Resolved Conflicts:
	daemon/src/sip/sipvoiplink.cpp
parents 904f7882 f2762ba6
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment