Skip to content
GitLab
Commit 19d7ab8d authored by Liang Qi's avatar Liang Qi
Browse files

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

Conflicts:
	src/plugins/sensors/ios/ios.pro

Change-Id: I8d9ca692713c8ba5d8c243371474b0e61630b05e
parents 26446d7d 2c595c38
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 110 additions and 71 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