Commit 256e0b4a authored by Liang Qi's avatar Liang Qi
Browse files

Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	doc/src/qmlapp/deployment.qdoc

Change-Id: I04f75d1a82c611f1781e4ec942c490f6f465d7d6
parents 2d021dd9 7f427f73
Branches
Tags
No related merge requests found
Showing with 27 additions and 13 deletions
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