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

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

 Conflicts:
	src/core/download_manager_delegate_qt.cpp

Change-Id: Ica57e582a323c6bd014a64bb615dd9454e656548
parents d502c6e9 f2d93896
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 15 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