Skip to content
GitLab
Commit 45189de8 authored by Michael Brüning's avatar Michael Brüning Committed by Simon Hausmann
Browse files

Merge remote-tracking branch 'origin/5.9' into 5.10.1 

Conflicts:
    src/core/web_engine_context.cpp

Change-Id: I004994a0ab6dbc54370b6973de1816cd673154c6
parents 7e03f40a e864d865
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 2 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