Skip to content
Snippets Groups Projects
user avatar
Emmanuel Milou authored
Conflicts:
	sflphone-common/src/audio/mainbuffer.cpp
	sflphone-common/src/conference.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sip/sipvoiplink.cpp
9984bb63
History
Name Last commit Last update