From: Michael Vogel <icarus@dabo.de>
Date: Fri, 4 Dec 2015 06:07:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=25c2e219eed41f95637c13e24b263a0870fb85be;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts
---

25c2e219eed41f95637c13e24b263a0870fb85be