From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 19 Nov 2017 01:52:52 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.102^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=29200ff9aecc3da43a012b63a3023b1c5a0ae416;hp=d31914827058b143d4c9cd514bba5f70142ee984;p=feisty_meow.git

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

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