From: rinpatch <rinpatch@sdf.org>
Date: Tue, 19 Nov 2019 20:04:19 +0000 (+0000)
Subject: Merge branch 'release/1.1.6' into 'stable'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0ba3f1ffb28792c21809fa9a30fc03a7a52d9361;p=akkoma

Merge branch 'release/1.1.6' into 'stable'

Release/1.1.6

See merge request pleroma/pleroma!1995
---

0ba3f1ffb28792c21809fa9a30fc03a7a52d9361