From: Michael <heluecht@pirati.ca>
Date: Mon, 22 Jan 2018 22:22:16 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into bbcode-url-detection
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3b6b67214145d09f79e9519ae368f0de49f7e76c;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into bbcode-url-detection
---

3b6b67214145d09f79e9519ae368f0de49f7e76c