From: Michael Vogel Date: Fri, 19 Feb 2016 10:55:57 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d10eee45b9d539a282180344fb5d5972a887e0ba;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content --- d10eee45b9d539a282180344fb5d5972a887e0ba