Merge branch 'release/20.08' into master

author Nate Graham <nate@kde.org>

Tue, 8 Sep 2020 19:38:38 +0000 (13:38 -0600)

committer Nate Graham <nate@kde.org>

Tue, 8 Sep 2020 19:38:38 +0000 (13:38 -0600)
author Nate Graham <nate@kde.org>
Tue, 8 Sep 2020 19:38:38 +0000 (13:38 -0600)
committer Nate Graham <nate@kde.org>
Tue, 8 Sep 2020 19:38:38 +0000 (13:38 -0600)
diff --cc src/settings/general/previewssettingspage.cpp
Simple merge
author	Nate Graham <nate@kde.org>
	Tue, 8 Sep 2020 19:38:38 +0000 (13:38 -0600)
committer	Nate Graham <nate@kde.org>
	Tue, 8 Sep 2020 19:38:38 +0000 (13:38 -0600)