From: Michael <heluecht@pirati.ca>
Date: Wed, 7 Jun 2017 05:28:37 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1706-lock
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6161ceff649fd52cb6cdfe14ebe5fdd35f6854a9;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1706-lock
---

6161ceff649fd52cb6cdfe14ebe5fdd35f6854a9