Commit 73dc5f8d authored by Liang Qi's avatar Liang Qi
Browse files

Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	doc/src/legal/licenses.qdoc

Change-Id: Id0fb35581b32d98cc9172a7eea6f6e2375cee1f0
Showing with 123 additions and 89 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