From: Michael <heluecht@pirati.ca>
Date: Thu, 26 Apr 2018 20:42:30 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d071a5cdad76f657fe0527b45717068b53b14bae;p=friendica.git

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

d071a5cdad76f657fe0527b45717068b53b14bae