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/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
This commit is contained in:
Kevin Granger
2013-09-30 11:01:23 +02:00
parent f84a3c7fda 3e85622972
commit 8ed77030aa
84 changed files with 741 additions and 17517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/langs/br/data/quick_access.xml
+4 -4
View File
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<entity_quick_access>
<quick_access id="Home" name="Home"/>
<quick_access id="My_Shop" name="My Shop"/>
<quick_access id="New_category" name="New category"/>
<quick_access id="New_product" name="New product"/>
<quick_access id="New_voucher" name="New voucher"/>
<quick_access id="My_Shop" name="Minha Loja"/>
<quick_access id="New_category" name="Nova Categoria"/>
<quick_access id="New_product" name="Novo Produto"/>
<quick_access id="New_voucher" name="Novo Cupom"/>
</entity_quick_access>