Merge branch 'bugfix/federation-kroeg' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 16 Aug 2018 15:20:15 +0000 (15:20 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 16 Aug 2018 15:20:15 +0000 (15:20 +0000)
commit5fbb14f5ecbbd9feeed2a303c2619fbbba07d70e
treea2045791b4c0027b0c41c6a14ab504fcb3099956
parent38361e7b5e24cbbd4654bd76fce4b3c66562ab59
parent805844367475af3929b059d46f88cc31132fac1b
Merge branch 'bugfix/federation-kroeg' into 'develop'

fix federation with kroeg

See merge request pleroma/pleroma!272