Skip to content
Snippets Groups Projects
Commit 2318922f authored by Julien Bonjean's avatar Julien Bonjean
Browse files

Merge branch 'master' into jbonjean 

Conflicts:
	sflphone-common/src/dbus/configurationmanager-introspec.xml
parents 744765e1 c9d7e1f3
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 6982 additions and 5656 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment