From: Michael Vogel Date: Wed, 23 Mar 2016 05:59:20 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1602-diaspora X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e8c07aaac67aea66bfcbe6b50b9dd8557bc4f036;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1602-diaspora --- e8c07aaac67aea66bfcbe6b50b9dd8557bc4f036