From: Michael <heluecht@pirati.ca>
Date: Fri, 27 Apr 2018 15:04:11 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=607f31f6317ed7b7b88abab33fbf62cf219ca7bc;p=friendica.git

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

607f31f6317ed7b7b88abab33fbf62cf219ca7bc