From: Michael <heluecht@pirati.ca>
Date: Sat, 2 Jun 2018 06:18:45 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into public-redir
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=885f2b52d168e078b590ee0b1f5aad12e0d2fe6f;p=friendica.git

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

885f2b52d168e078b590ee0b1f5aad12e0d2fe6f