From: Michael <heluecht@pirati.ca>
Date: Fri, 11 Aug 2017 16:24:33 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into dba-2
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=05393a6faaa130450ee024a37aafd3f1508d2f9f;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into dba-2
---

05393a6faaa130450ee024a37aafd3f1508d2f9f