From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 1 Jun 2020 16:14:54 +0000 (-0400)
Subject: Merge branch 'release-2.140.121' into dev
X-Git-Tag: 2.140.122^2~9
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=7a7838e8e231895336fad4e2920b0bba40ee68cc;hp=3ccfc799c6e1bcc3c0b282797267a65aa7e4c714;p=feisty_meow.git

Merge branch 'release-2.140.121' into dev

pull in release diffs
---

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index 03dc0e74..838846f2 100644
--- a/production/feisty_meow_config.ini
+++ b/production/feisty_meow_config.ini
@@ -3,7 +3,7 @@
 # specifies the version of the code that is being constructed here.
 major=2
 minor=140
-revision=120
+revision=121
 build=420
 
 # specifies the remainder of the version record info.