Skip to content
GitLab
Commit f515a560 authored by Guillaume Beraudo's avatar Guillaume Beraudo
Browse files

Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone 

Conflicts:
	mediastreamer2
parents c0785a9c 5f356316
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 401 additions and 137 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