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