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

Merge branch 'configyaml' of... 

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

Conflicts:
	sflphone-common/src/managerimpl.cpp
parents 7067bc09 57aba779
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1360 additions and 54 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment