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