Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

This commit is contained in:
vAugagneur
2012-12-12 16:24:41 +01:00
+1 -1
View File
@@ -707,7 +707,7 @@ Country</value>
<value>PrestaShop</value> <value>PrestaShop</value>
</configuration> </configuration>
<configuration id="PS_SHOP_EMAIL" name="PS_SHOP_EMAIL"> <configuration id="PS_SHOP_EMAIL" name="PS_SHOP_EMAIL">
<value>raphael.malie@gmail.com</value> <value>pub@prestashop.com</value>
</configuration> </configuration>
<configuration id="PS_MAIL_METHOD" name="PS_MAIL_METHOD"> <configuration id="PS_MAIL_METHOD" name="PS_MAIL_METHOD">
<value>1</value> <value>1</value>