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

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

a21f6135fcd8f0bfdb49de38a5ab4954d1784503