Merge branch 'Applications/18.04'

author Kai Uwe Broulik <kde@privat.broulik.de>

Wed, 6 Jun 2018 07:18:17 +0000 (09:18 +0200)

committer Kai Uwe Broulik <kde@privat.broulik.de>

Wed, 6 Jun 2018 07:18:17 +0000 (09:18 +0200)
author Kai Uwe Broulik <kde@privat.broulik.de>
Wed, 6 Jun 2018 07:18:17 +0000 (09:18 +0200)
committer Kai Uwe Broulik <kde@privat.broulik.de>
Wed, 6 Jun 2018 07:18:17 +0000 (09:18 +0200)
diff --cc src/kitemviews/private/kbaloorolesprovider.cpp
Simple merge
author	Kai Uwe Broulik <kde@privat.broulik.de>
	Wed, 6 Jun 2018 07:18:17 +0000 (09:18 +0200)
committer	Kai Uwe Broulik <kde@privat.broulik.de>
	Wed, 6 Jun 2018 07:18:17 +0000 (09:18 +0200)