From: Michael Vogel Date: Mon, 30 May 2016 05:24:06 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1605-frio-template-clean X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=52186671966e34c1ad5e31c36dbb07da524d1bdf;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1605-frio-template-clean --- 52186671966e34c1ad5e31c36dbb07da524d1bdf