Skip to content
Snippets Groups Projects
Commit 1d47ab18 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'master' into cleanup

Conflicts:

	src/managerimpl.cpp
	src/useragent.cpp
	src/voiplink.cpp
	src/voiplink.h
parents 698c45a3 03a19145
No related branches found
No related tags found
No related merge requests found
Showing with 232 additions and 99 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment