From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 18 Nov 2017 03:07:49 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.102^2~4
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=63ea27b95da893143c3f30c76ebd89d87d65d3fd;hp=61c98f4cb800c8d799e9a2030ea4d4de852e4982;p=feisty_meow.git

Merge branch 'master' of feistymeow.org:feisty_meow into dev
---

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index 7abba849..9ebbd74e 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=100
+revision=101
 build=420
 
 # specifies the remainder of the version record info.