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

Merge branch 'stable' into sip_dev 

Conflicts:

	src/dbus/callmanager.cpp
	src/dbus/contactmanager.cpp
	src/dbus/instance.cpp
parents 81584699 f0a0d892
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 58528 additions and 21 deletions
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