From: lain <lain@soykaf.club>
Date: Wed, 13 May 2020 08:12:09 +0000 (+0000)
Subject: Merge branch 'release/2.0.5' into 'stable'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a5ccb5b0b1032b102c54d4df2e17c61423089e73;hp=2906cbbd40ea07c2ceb4d67e1c889cc7ab8b7662;p=akkoma

Merge branch 'release/2.0.5' into 'stable'

Release/2.0.5

See merge request pleroma/secteam/pleroma!4
---