projects / feisty_meow.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitc589a3686d4508c9c5ea7841deb9be251460ddc3
tree22302a674042366f6972529b0ff2c2b29a786064tree | snapshot
parent4c595ba63a6c5203e104fe83fee43d69d3ff7aefcommit | diff
parent8f403891425dfe131948be97cae4edf21f3f7869commit | diff
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.94

mistaken merge on branch.  this got trapped on a machine where it then got updated out of band with the real release.