From: Michael Vogel Date: Thu, 21 Jul 2016 20:49:06 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into develop X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4c5fb5947d9389a64da4c030d92f42fe0ec78895;p=friendica.git Merge remote-tracking branch 'upstream/develop' into develop --- 4c5fb5947d9389a64da4c030d92f42fe0ec78895