From kde-commits  Thu May 31 21:55:53 2018
From: Matthieu Gallien <null () kde ! org>
Date: Thu, 31 May 2018 21:55:53 +0000
To: kde-commits
Subject: [elisa/file_browser] src: Merge branch 'master' into file_browser
Message-Id: <E1fOVY1-0006tX-CW () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=152780376815044

Git commit cf9bb6a723c40196413b01f4ddef5277d8aabbaa by Matthieu Gallien.
Committed on 29/05/2018 at 08:18.
Pushed by mgallien into branch 'file_browser'.

Merge branch 'master' into file_browser

M  +3    -3    src/qml/Theme.qml
M  +3    -3    src/windows/WindowsTheme.qml

https://commits.kde.org/elisa/cf9bb6a723c40196413b01f4ddef5277d8aabbaa