projects / feisty_meow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 6b9142c)
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sun, 19 Nov 2017 22:00:46 +0000 (17:00 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 19 Nov 2017 22:00:46 +0000 (17:00 -0500)
production/feisty_meow_config.ini patch | blob | history
production/sites/cakelampvm.com/.gitignore [new file with mode: 0644] patch | blob

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index 9ebbd74ecdee5393a98377b8db0a34f98d672dd4..e11b6d7ad89897ba76afb90265bdc1be559811bd 100644 (file)
--- 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 (file)
index 0000000..114c763
--- /dev/null
+++ b/production/sites/cakelampvm.com/.gitignore
@@ -0,0 +1 @@
+google*.html