projects / feisty_meow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 989a03f e5eb2d2)
Merge branch 'master' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 05:57:53 +0000 (00:57 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 05:57:53 +0000 (00:57 -0500)
getting dev in synch with new master branch


Trivial merge