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

Merge branch 'master' into qt-client

Conflicts:

	src/managerimpl.cpp
parents 7cd7788a 2ace0800
Branches
Tags
No related merge requests found
Showing
with 990 additions and 250 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment