Merge branch 'release/20.08' into master

author Elvis Angelaccio <elvis.angelaccio@kde.org>

Tue, 25 Aug 2020 22:49:00 +0000 (00:49 +0200)

committer Elvis Angelaccio <elvis.angelaccio@kde.org>

Tue, 25 Aug 2020 22:49:00 +0000 (00:49 +0200)
author Elvis Angelaccio <elvis.angelaccio@kde.org>
Tue, 25 Aug 2020 22:49:00 +0000 (00:49 +0200)
committer Elvis Angelaccio <elvis.angelaccio@kde.org>
Tue, 25 Aug 2020 22:49:00 +0000 (00:49 +0200)
diff --cc src/settings/viewmodes/viewsettingstab.cpp
Simple merge
author	Elvis Angelaccio <elvis.angelaccio@kde.org>
	Tue, 25 Aug 2020 22:49:00 +0000 (00:49 +0200)
committer	Elvis Angelaccio <elvis.angelaccio@kde.org>
	Tue, 25 Aug 2020 22:49:00 +0000 (00:49 +0200)