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)
commit2ab7aeb3aba9e7a820210c95ef37790972b1c5df
tree2db0ffddff13eb7d1f0551db1c8eb2b27795932f
parent6c3f5e8ba0b164ef50e0c7bf0fe36223f821b680
parentf339ec39399a85ab7febe82db3945ab01be45ecf
Merge branch 'cherry-pick-764931fc' into 'maint/1.1'

Cherry pick tesla update to 1.1

See merge request pleroma/pleroma!1687