aboutsummaryrefslogtreecommitdiffstats
path: root/Magento.gitignore
diff options
context:
space:
mode:
authorJustin Spahr-Summers <jspahrsummers@github.com>2013-11-12 20:46:50 -0800
committerJustin Spahr-Summers <jspahrsummers@github.com>2013-11-12 20:46:50 -0800
commit52ec58209bd6e69edc4a1a16b8b798e04f983f49 (patch)
tree61ff32dee0dedd653adce44207fdc8de8dbbaddc /Magento.gitignore
parent1b76d53beb8dd5fbbaaa32b23e99aa2832591548 (diff)
parentd9fd3eaa17eeaddaa5d4341f70ffb4854ce30575 (diff)
downloadgitignore-52ec58209bd6e69edc4a1a16b8b798e04f983f49.tar.gz
gitignore-52ec58209bd6e69edc4a1a16b8b798e04f983f49.zip
Merge pull request #755 from ohmanger/patch-1
Ignore local.xml as this contains database credentials.
Diffstat (limited to 'Magento.gitignore')
-rw-r--r--Magento.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/Magento.gitignore b/Magento.gitignore
index 8fee704d..7eac4663 100644
--- a/Magento.gitignore
+++ b/Magento.gitignore
@@ -37,6 +37,7 @@ app/etc/config.xml
app/etc/enterprise.xml
app/etc/local.xml.additional
app/etc/local.xml.template
+app/etc/local.xml
app/.htaccess
app/locale/
app/Mage.php