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