From: AndyHee <andy@hubup.pro>
Date: Sat, 2 Dec 2017 05:57:27 +0000 (+0700)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=53e0dc7f875d32e8f9d45b3d4531bd6cb8db04ad;p=friendica.git

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

53e0dc7f875d32e8f9d45b3d4531bd6cb8db04ad