From: AndyHee <andy@hubup.pro>
Date: Thu, 7 Dec 2017 07:35:19 +0000 (+0700)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b21703f7788c44fff9ddc53bb24bafee55ee931c;p=friendica.git

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

b21703f7788c44fff9ddc53bb24bafee55ee931c