From: Michael <heluecht@pirati.ca>
Date: Wed, 30 Nov 2016 04:46:47 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1611-frontend
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1f50dc368e9202cdeb7b02ce9527429fd5cc31aa;p=friendica.git

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

1f50dc368e9202cdeb7b02ce9527429fd5cc31aa