Merge pull request github#1308 from ovanschie/patch-1

Update for Magento 1.9.1
martinrohbeck · Jan 7, 2015 · 7c24eeb · 7c24eeb
2 parents 29c7bc8 + 0ff1028
commit 7c24eeb
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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/