Merge branch 'chore/elixir-1.11' of git.pleroma.social:pleroma/pleroma into chore...
authorMark Felder <feld@FreeBSD.org>
Wed, 7 Oct 2020 16:45:11 +0000 (11:45 -0500)
committerMark Felder <feld@FreeBSD.org>
Wed, 7 Oct 2020 16:45:11 +0000 (11:45 -0500)

Trivial merge