From: Michael Vogel Date: Tue, 1 Mar 2016 09:45:16 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1602-diaspora X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b48880fe52aaf51cb843d855114990be001a5279;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1602-diaspora --- b48880fe52aaf51cb843d855114990be001a5279