Merge branch 'cherry-pick-764931fc' into 'maint/1.1'
authorrinpatch <rinpatch@sdf.org>
Tue, 17 Sep 2019 19:49:10 +0000 (19:49 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 17 Sep 2019 19:49:10 +0000 (19:49 +0000)
Cherry pick tesla update to 1.1

See merge request pleroma/pleroma!1687


Trivial merge