From: Michael <heluecht@pirati.ca>
Date: Mon, 30 Apr 2018 13:09:11 +0000 (+0000)
Subject: Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=490907532112deab57855d747a05b21bcf1411d4;p=friendica.git

Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
---

490907532112deab57855d747a05b21bcf1411d4