Commit a257b0ee authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge branch 'release' into old/5.0

Conflicts:
	src/assistant/assistant/assistant.pro

Change-Id: Ifa7d318f8482c09367388d6c9f848c4931a5ead7
parents f212e46f 1b02287e
Showing with 32 additions and 7 deletions
Supports Markdown
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