From: rinpatch <rinpatch@sdf.org>
Date: Sat, 14 Dec 2019 15:01:09 +0000 (+0000)
Subject: Merge branch 'release/1.1.7' into 'stable'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ecb3386f939de3ffba16f9419994a009f2e59ded;p=akkoma

Merge branch 'release/1.1.7' into 'stable'

Release/1.1.7

See merge request pleroma/pleroma!2065
---

ecb3386f939de3ffba16f9419994a009f2e59ded