From: Michael Vogel Date: Mon, 1 Aug 2016 06:02:26 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into develop X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=02b5f6a34d8589c8920ff28351ecd231d8b1204e;p=friendica.git Merge remote-tracking branch 'upstream/develop' into develop --- 02b5f6a34d8589c8920ff28351ecd231d8b1204e