Skip to content
GitLab
Commit 65b0bebc authored by Simon Morlat's avatar Simon Morlat
Browse files

Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone 

Conflicts:
	mediastreamer2
parents fb1a35e3 693aa43e
Hide whitespace changes
Inline Side-by-side
Showing
with 25 additions and 11 deletions
Supports Markdown
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