From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 21 Nov 2017 14:25:33 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~75
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=4de2d81c54f3f8d3860ba942a3e385e29f8d9b02;hp=afef5e5127c1a2ef7362f2d705c39a9b1cbb910e;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 8d40e50c..a8dca7ca 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=104
+revision=105
 build=420
 
 # specifies the remainder of the version record info.