Merge branch 'Applications/17.12'

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

Tue, 13 Feb 2018 22:20:49 +0000 (23:20 +0100)

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

Tue, 13 Feb 2018 22:20:49 +0000 (23:20 +0100)
author Elvis Angelaccio <elvis.angelaccio@kde.org>
Tue, 13 Feb 2018 22:20:49 +0000 (23:20 +0100)
committer Elvis Angelaccio <elvis.angelaccio@kde.org>
Tue, 13 Feb 2018 22:20:49 +0000 (23:20 +0100)
diff --cc src/settings/viewmodes/viewsettingstab.cpp
Simple merge
author	Elvis Angelaccio <elvis.angelaccio@kde.org>
	Tue, 13 Feb 2018 22:20:49 +0000 (23:20 +0100)
committer	Elvis Angelaccio <elvis.angelaccio@kde.org>
	Tue, 13 Feb 2018 22:20:49 +0000 (23:20 +0100)