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

Merge branch 'recording'

Conflicts:

	src/Makefile.am
	src/sipvoiplink.cpp
parents eb8f2599 ee5ae847
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.
Finish editing this message first!
Please register or to comment