projects / feisty_meow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2072733 7d02b43)
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92 release-2.140.92
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:32:46 +0000 (17:32 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:32:46 +0000 (17:32 -0500)
updates from dev branch


Trivial merge