Skip to content
GitLab
Commit c9a64fda authored by Allan Sandfeld Jensen's avatar Allan Sandfeld Jensen
Browse files

Merge branch '5.12' into 5.13 

Conflicts:
	src/3rdparty
	src/core/renderer/user_resource_controller.cpp
	src/core/web_contents_adapter.cpp
	src/webengine/doc/src/qtwebengine-overview.qdoc

Change-Id: I46be9d33b3b65d61dfa099ee72a3509afb9bd6a4
parents 10611866 44303861
Hide whitespace changes
Inline Side-by-side
Showing
with 45 additions and 42 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