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

Merge branch 'fonseca' of... 

Merge branch 'fonseca' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone into fonseca

Conflicts:
	sflphone-common/src/managerimpl.cpp
parents 7fb6a39a 80b99f90
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 555 additions and 233 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