Skip to content
Snippets Groups Projects
Commit de516201 authored by Jérémy Quentin's avatar Jérémy Quentin
Browse files

Merge branch 'master' into qt-client 

Conflicts:

	src/dbus/configurationmanager-glue.h
	src/dbus/configurationmanager.cpp
	src/managerimpl.cpp
parents 695c37fa b35e9de8
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 622 additions and 425 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment