Skip to content
GitLab
Commit efacf765 authored by J-P Nurmi's avatar J-P Nurmi
Browse files

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

Change-Id: Ife57f59094cb9be9c5e8a187df8d1fd25110a53a
parents 8e7e0c7d ca06986a
Hide whitespace changes
Inline Side-by-side
Showing
with 19 additions and 13 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