dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
This commit is contained in:
Kevin Granger
2013-09-13 11:41:14 +02:00
parent ce74aeb357 db4b69d10c
commit c7ec33f062
247 changed files with 7965 additions and 4936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/data/xml/configuration.xml
+2 -2
View File
@@ -689,7 +689,7 @@ Country</value>
<value>7700</value>
</configuration>
<configuration id="PS_VERSION_DB" name="PS_VERSION_DB">
<value>1.5.0.9</value>
<value>1.5.5.0</value>
</configuration>
<configuration id="PS_BASE_DISTANCE_UNIT" name="PS_BASE_DISTANCE_UNIT">
<value>m</value>
@@ -701,7 +701,7 @@ Country</value>
<value>localhost</value>
</configuration>
<configuration id="PS_INSTALL_VERSION" name="PS_INSTALL_VERSION">
<value>1.5.0.9</value>
<value>1.5.5.0</value>
</configuration>
<configuration id="PS_SHOP_NAME" name="PS_SHOP_NAME">
<value>PrestaShop</value>