Skip to content
Commit 11009380 authored by Simone Gaiarin's avatar Simone Gaiarin
Browse files

Merge remote-tracking branch 'origin/5.3' 

# Conflicts:
#	plugins/contextbrowser/browsemanager.cpp
parents 8d692253 5c549592
Pipeline #4627 failed with stage
in 1 hour and 1 second
Hide whitespace changes
Inline Side-by-side
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