From kde-commits  Mon Sep 24 13:21:23 2018
From: david nelband <null () kde ! org>
Date: Mon, 24 Sep 2018 13:21:23 +0000
To: kde-commits
Subject: [ocs-webserver/dev] /: Merge branch 'dev' of git.kde.org:ocs-webserver into dev
Message-Id: <E1g4Qnj-0008LI-N3 () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=153779639703143

Git commit b811ffddc0a5a8afd42201bf843408df830c8d5f by david nelband.
Committed on 24/09/2018 at 13:21.
Pushed by dnelband into branch 'dev'.

Merge branch 'dev' of git.kde.org:ocs-webserver into dev


https://commits.kde.org/ocs-webserver/b811ffddc0a5a8afd42201bf843408df830c8=
d5f