Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
authorMichael <heluecht@pirati.ca>
Mon, 30 Apr 2018 13:09:11 +0000 (13:09 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 30 Apr 2018 13:09:11 +0000 (13:09 +0000)
commit490907532112deab57855d747a05b21bcf1411d4
treece313f494a0198587bb04c0a649229d8072014d9
parent5588f0d2ae6f9890f2ee5646806e8db23436391a
parentb2b597288cdded396ba6ccfc20aa06c3983364cf
Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
src/Worker/Delivery.php