projects / feisty_meow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c595ba 8f40389)
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.94 release-2.140.94
authorChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 17:56:19 +0000 (12:56 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 17:56:19 +0000 (12:56 -0500)
mistaken merge on branch.  this got trapped on a machine where it then got updated out of band with the real release.


Trivial merge