Commit a0855a43 authored by Liang Qi's avatar Liang Qi
Browse files

Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	src/websockets/qwebsocket_p.cpp

Change-Id: Ib6b9655985246c9ce3968f1eb662be457465a937
parents 488aa340 ccb13854
No related merge requests found
Showing with 13 additions and 17 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