TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into frontend

Browse Source 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
This commit is contained in:
touffies
2013-10-22 11:55:58 +02:00
parent 945471dd8a cb0619a7b3
commit 9d5aa5e077
118 changed files with 3694 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
templates/admin/default/customers.html
View File

@@ -3,7 +3,8 @@
{block name="page-title"}{intl l='Customer'}{/block}
{block name="check-permissions"}admin.customer.view{/block}
{block name="check-resource"}admin.customer{/block}
{block name="check-access"}view{/block}
{block name="main-content"}
{assign var=customer_page value={$smarty.get.page|default:1}}