From kde-commits  Tue Jul 24 08:46:49 2018
From: Jaroslaw Staniek <null () kde ! org>
Date: Tue, 24 Jul 2018 08:46:49 +0000
To: kde-commits
Subject: [kexi] /: Merge remote-tracking branch 'origin/3.1'
Message-Id: <E1fhsy1-0007qN-23 () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=153242201904462

Git commit 458fc3e4366208f7d3dce06f3d9e8f3e06b9d82d by Jaroslaw Staniek.
Committed on 24/07/2018 at 08:46.
Pushed by staniek into branch 'master'.

Merge remote-tracking branch 'origin/3.1'

# Conflicts:
#	src/plugins/forms/widgets/main/kexiforms_mainwidgetsplugin.json
#	src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.json


https://commits.kde.org/kexi/458fc3e4366208f7d3dce06f3d9e8f3e06b9d82d