1
0
mirror of https://github.com/github/gitignore synced 2024-12-25 14:20:15 +01:00

Merge pull request #893 from dng-dev/patch-1

Update to Magento 1.8.x
This commit is contained in:
Adam Roben 2014-01-06 19:35:03 -08:00
commit 8423d07b85

View File

@ -1,6 +1,7 @@
.modgit/ .modgit/
app/code/community/Find/ app/code/community/Find/
app/code/community/Phoenix/ app/code/community/Phoenix/
app/code/community/Cm/
app/code/core/ app/code/core/
app/design/adminhtml/default/default/ app/design/adminhtml/default/default/
app/design/adminhtml/default/find/ app/design/adminhtml/default/find/
@ -33,6 +34,7 @@ app/etc/modules/Mage_Weee.xml
app/etc/modules/Mage_Widget.xml app/etc/modules/Mage_Widget.xml
app/etc/modules/Mage_XmlConnect.xml app/etc/modules/Mage_XmlConnect.xml
app/etc/modules/Phoenix_Moneybookers.xml app/etc/modules/Phoenix_Moneybookers.xml
app/etc/modules/Cm_RedisSession.xml
app/etc/config.xml app/etc/config.xml
app/etc/enterprise.xml app/etc/enterprise.xml
app/etc/local.xml.additional app/etc/local.xml.additional
@ -77,6 +79,9 @@ lib/PEAR/
lib/phpseclib/ lib/phpseclib/
lib/Varien/ lib/Varien/
lib/Zend/ lib/Zend/
lib/Cm/
lib/Credis/
lib/Magento/
LICENSE_AFL.txt LICENSE_AFL.txt
LICENSE.html LICENSE.html
LICENSE.txt LICENSE.txt
@ -89,7 +94,7 @@ media/.htaccess
media/import/ media/import/
media/xmlconnect/ media/xmlconnect/
media/catalog/product/cache/ media/catalog/product/cache/
api.php
nbproject/ nbproject/
pear pear
pear/ pear/