From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 21 Aug 2020 20:15:42 +0000 (-0400)
Subject: Merge branch 'main' into dev
X-Git-Tag: 2.140.134~12^2~46
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=496aa345b576bc0eb95d34d4456827243718a1a3;hp=318b779c5d45c9c073e68e16dcd680f250ef9053;p=feisty_meow.git

Merge branch 'main' into dev

horrible hose-up of editing a lot of stuff in main branch rather than in dev.  i hope.  because that's what i think i'm fixing here.
---