Merge branch 'main' into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 21 Aug 2020 20:15:42 +0000 (16:15 -0400)
committerChris Koeritz <fred@gruntose.com>
Fri, 21 Aug 2020 20:15:42 +0000 (16:15 -0400)
commit496aa345b576bc0eb95d34d4456827243718a1a3
tree564c966ed20d8f483e77a14fa34d276133ac9e43
parentb6be82ecac5d61cb27527488381ab2237ce15b49
parent318b779c5d45c9c073e68e16dcd680f250ef9053
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.