From: Michael Vogel Date: Mon, 18 Apr 2016 04:15:29 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into bugfix-attachments X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d928928fda160b242870bfa2ac8e289b384c5bff;p=friendica.git Merge remote-tracking branch 'upstream/develop' into bugfix-attachments --- d928928fda160b242870bfa2ac8e289b384c5bff