From: lain <lain@soykaf.club>
Date: Fri, 28 Jun 2019 15:29:44 +0000 (+0000)
Subject: Merge branch 'release/1.0' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=456668b490e9ee47cf773a8563a9f3a3765ce348;p=akkoma

Merge branch 'release/1.0' into 'develop'

1.0 Release

See merge request pleroma/pleroma!1348
---

456668b490e9ee47cf773a8563a9f3a3765ce348