Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
authorFloatingGhost <hannah@coffee-and-dreams.uk>
Fri, 7 Jan 2022 20:23:53 +0000 (20:23 +0000)
committerFloatingGhost <hannah@coffee-and-dreams.uk>
Fri, 7 Jan 2022 20:23:53 +0000 (20:23 +0000)

Trivial merge