Skip to content
Snippets Groups Projects
Commit ecf192c9 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

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

Conflicts:
	daemon/src/managerimpl.cpp
parents fc0b9f5a c6395b02
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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