Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorFred Hamster <fred@gruntose.com>
Sun, 5 Jun 2022 16:00:42 +0000 (12:00 -0400)
committerFred Hamster <fred@gruntose.com>
Sun, 5 Jun 2022 16:00:42 +0000 (12:00 -0400)

Trivial merge