projects / feisty_meow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a0df8e 0725007)
Merge branch 'main' into dev
authorChris Koeritz <cak0l@virginia.edu>
Fri, 21 Aug 2020 20:15:42 +0000 (16:15 -0400)
committerChris Koeritz <cak0l@virginia.edu>
Fri, 21 Aug 2020 20:15:42 +0000 (16:15 -0400)
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.


Trivial merge