Skip to content
GitLab
Commit e69d4a9f authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

Merge remote-tracking branch 'origin/5.3' into 5.4 

Conflicts:
	src/assistant/assistant/mainwindow.cpp
	src/linguist/linguist/mainwindow.cpp
	src/qdbus/qdbusviewer/qdbusviewer.cpp

Change-Id: I1f5524ab747be561ed0b13d8b1fd8cb51a890363
parents d5540782 a1751e3d
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 331 additions and 63 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