From: kaniini <nenolod@gmail.com>
Date: Thu, 16 Aug 2018 15:20:15 +0000 (+0000)
Subject: Merge branch 'bugfix/federation-kroeg' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5fbb14f5ecbbd9feeed2a303c2619fbbba07d70e;p=akkoma

Merge branch 'bugfix/federation-kroeg' into 'develop'

fix federation with kroeg

See merge request pleroma/pleroma!272
---

5fbb14f5ecbbd9feeed2a303c2619fbbba07d70e