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

Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js

This commit is contained in:

Kevin Granger

2013-08-21 09:14:10 +02:00

parent 17be1e7528 f610b0d844

commit 3005ca39f2

274 changed files with 9470 additions and 1279 deletions

									
										controllers/admin/AdminCountriesController.php
									
		+2
		-1
	
												View File
												
				@@ -140,7 +140,8 @@ class AdminCountriesControllerCore extends AdminController

							array('address2'),

							array('postcode', 'city'),

							array('Country:name'),

							array('phone'));

							array('phone'),

							array('phone_mobile'));

						foreach ($default_layout_tab as $line)

							$default_layout .= implode(' ', $line)."\r\n";