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