From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 19 Nov 2017 22:00:46 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.103^2~11^2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=29c5038b74a7bf876f0f78b4264f23a3137f9d7b;hp=6b9142cea57cb1d8478594f52acd3ed6ee015ac5;p=feisty_meow.git

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

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index 9ebbd74e..e11b6d7a 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=101
+revision=102
 build=420
 
 # specifies the remainder of the version record info.
diff --git a/production/sites/cakelampvm.com/.gitignore b/production/sites/cakelampvm.com/.gitignore
new file mode 100644
index 00000000..114c7637
--- /dev/null
+++ b/production/sites/cakelampvm.com/.gitignore
@@ -0,0 +1 @@
+google*.html