From: Michael <heluecht@pirati.ca>
Date: Sun, 12 Mar 2017 20:50:20 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1702-no-language
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b6a4a2ec7fcf7d9f28b0b0fdd9bc2ad2cdba2b3c;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1702-no-language
---

b6a4a2ec7fcf7d9f28b0b0fdd9bc2ad2cdba2b3c