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

Merge branch 'release' 

Conflicts:
	sflphone-common/src/audio/mainbuffer.cpp
	sflphone-common/src/conference.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sip/sipvoiplink.cpp
parents d9502af8 18700e6a
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 6802 additions and 5058 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