From: Michael Vogel Date: Thu, 24 Mar 2016 15:19:52 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1602-diaspora X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ec90a9e6ad1b2d424f7c72410d4a5a6cec2aad9b;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1602-diaspora --- ec90a9e6ad1b2d424f7c72410d4a5a6cec2aad9b