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

Merge branch 'master' of git+ssh://sflphone_org@sflphone.org/git/sflphone 

Conflicts:

	src/audio/codecDescriptor.cpp
parents 5d73443c f20eeffe
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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