Merge branch 'cherry-pick-8a7ee9fe' into 'stable'
authorfeld <feld@feld.me>
Fri, 20 Nov 2020 21:40:23 +0000 (21:40 +0000)
committerfeld <feld@feld.me>
Fri, 20 Nov 2020 21:40:23 +0000 (21:40 +0000)
commit9fc3356a06158c21c7e113552de4bcf2a6426df7
tree7b37f5886e397a63a204a4b5f35a5faacc926698
parent3e7642b123929593a3f414f63d1708ead11f47b0
parentba3bf16c701e8028bc7345b34c0d6d75151cacc6
Merge branch 'cherry-pick-8a7ee9fe' into 'stable'

Merge branch 'revert-da4660d2' into 'stable'

See merge request pleroma/pleroma!3166