Merge branch 'chore/back-to-upstream-tesla' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 7 Sep 2020 12:38:22 +0000 (12:38 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 7 Sep 2020 12:38:22 +0000 (12:38 +0000)
commitb5f3694302502bb1f5e15637aea74548c2ceb68a
treea0c2fce1884b1be9eaa8124591d844920c07b6e2
parentd5c286b80225b51dabf4eb63ad8ab818ea534851
parent8628e1b216339eaf0c294aa8f01911a9399d912d
Merge branch 'chore/back-to-upstream-tesla' into 'develop'

switch back to upstream tesla

See merge request pleroma/pleroma!2966