From: Michael Vogel Date: Tue, 26 Jul 2016 20:15:49 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=287c9cfbdd156ddc4edbea6b9b76d950071aaf04;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml --- 287c9cfbdd156ddc4edbea6b9b76d950071aaf04