From: Michael Vogel Date: Mon, 6 Jul 2015 15:35:48 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bc6e5a4f2db07ddccfc0b6d0ac5ca088b4a277b1;hp=-c;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links --- bc6e5a4f2db07ddccfc0b6d0ac5ca088b4a277b1