From: rinpatch <rinpatch@sdf.org>
Date: Tue, 17 Sep 2019 19:49:10 +0000 (+0000)
Subject: Merge branch 'cherry-pick-764931fc' into 'maint/1.1'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=2ab7aeb3aba9e7a820210c95ef37790972b1c5df;p=akkoma

Merge branch 'cherry-pick-764931fc' into 'maint/1.1'

Cherry pick tesla update to 1.1

See merge request pleroma/pleroma!1687
---

2ab7aeb3aba9e7a820210c95ef37790972b1c5df