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] /: Merge branch 'master' into file_browser
Message-Id: <E1fOVY1-0006tX-ER () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=152780376515041

Git commit 96bebb9802b7c312806a473f129f584c3ba14d7c by Matthieu Gallien.
Committed on 30/05/2018 at 05:23.
Pushed by mgallien into branch 'file_browser'.

Merge branch 'master' into file_browser

M  +1    -1    CMakeLists.txt
M  +1    -1    src/CMakeLists.txt

https://commits.kde.org/elisa/96bebb9802b7c312806a473f129f584c3ba14d7c