From: Andi <andiana@PC>
Date: Wed, 21 Mar 2018 23:34:38 +0000 (+0100)
Subject: Merge branch '3.6-rc' of https://github.com/Andi-K/friendica into 3.6-rc
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c69fa859c468bb881530abfa0ce8f78d43f68a89;p=friendica.git

Merge branch '3.6-rc' of https://github.com/Andi-K/friendica into 3.6-rc
---

c69fa859c468bb881530abfa0ce8f78d43f68a89