From: Michael Vogel Date: Mon, 25 Apr 2016 20:25:13 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1604-cookie X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ca72c5f2564699b7e32bc5a16d23668a4b61b504;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1604-cookie --- ca72c5f2564699b7e32bc5a16d23668a4b61b504