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

Merge branch 'master' of... 

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

Conflicts:
	sflphone-common/src/managerimpl.cpp
parents 073e7c24 bb1a13a0
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 329 additions and 305 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment