projects / feisty_meow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02c681c 24c0b26)
Merge branch 'master' into dev
authorChris Koeritz <fred@gruntose.com>
Mon, 15 Jan 2018 16:48:06 +0000 (11:48 -0500)
committerChris Koeritz <fred@gruntose.com>
Mon, 15 Jan 2018 16:48:06 +0000 (11:48 -0500)
pulling in latest release into dev.
should only be the tag.  if that.


Trivial merge