From: Michael Vogel Date: Fri, 1 May 2015 09:06:39 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1505-oembed-bbcode X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=747607fe97dd6fdda3535320b4128fa76a27b255;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1505-oembed-bbcode --- 747607fe97dd6fdda3535320b4128fa76a27b255