From: Michael <heluecht@pirati.ca>
Date: Sat, 12 Aug 2017 07:37:06 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into dba-2
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b14b44e8a8334aa6878ea10c69c8286bf8ea72b5;p=friendica.git

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

b14b44e8a8334aa6878ea10c69c8286bf8ea72b5