From: Michael Vogel Date: Wed, 17 Feb 2016 11:18:46 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c770b00d6d3cc9628ad48a6f72cce527dda68b44;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content --- c770b00d6d3cc9628ad48a6f72cce527dda68b44