From: Michael Vogel Date: Thu, 16 Jun 2016 08:48:52 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1606-contact-id X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8762fb671fcdb6fd2cd61e379efff8f2b0ac6b79;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1606-contact-id --- 8762fb671fcdb6fd2cd61e379efff8f2b0ac6b79