aboutsummaryrefslogtreecommitdiffstats
path: root/Magento.gitignore
diff options
context:
space:
mode:
authorCarl Suster <carl@contraflo.ws>2015-01-07 16:17:11 +1100
committerCarl Suster <carl@contraflo.ws>2015-01-07 16:17:11 +1100
commit7c24eebba996810ad88c1c989c6eb03938d06aec (patch)
treec93db8245b047156b3d00495668cbf80ea822eae /Magento.gitignore
parent29c7bc87c5cde1c549b6685c4c8d2b316b7dc7e9 (diff)
parent0ff10282664b6e953d62bc91eca2e17c0d7f82b3 (diff)
downloadgitignore-7c24eebba996810ad88c1c989c6eb03938d06aec.tar.gz
gitignore-7c24eebba996810ad88c1c989c6eb03938d06aec.zip
Merge pull request #1308 from ovanschie/patch-1
Update for Magento 1.9.1
Diffstat (limited to 'Magento.gitignore')
-rw-r--r--Magento.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/Magento.gitignore b/Magento.gitignore
index 68254e6b..0d88bf88 100644
--- a/Magento.gitignore
+++ b/Magento.gitignore
@@ -21,6 +21,7 @@ app/etc/modules/Mage_Bundle.xml
app/etc/modules/Mage_Captcha.xml
app/etc/modules/Mage_Centinel.xml
app/etc/modules/Mage_Compiler.xml
+app/etc/modules/Mage_ConfigurableSwatches.xml
app/etc/modules/Mage_Connect.xml
app/etc/modules/Mage_CurrencySymbol.xml
app/etc/modules/Mage_Downloadable.xml
@@ -76,6 +77,7 @@ lib/.htaccess
lib/LinLibertineFont/
lib/Mage/
lib/PEAR/
+lib/Pelago/
lib/phpseclib/
lib/Varien/
lib/Zend/