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

Merge branch 'master' into tax

Browse Source 
Conflicts:
	local/config/schema.xml
This commit is contained in:
Etienne Roudeix
2013-09-27 13:35:39 +02:00
parent 7b3e7ece4d fbcd6b0cd2
commit a647bfd016
101 changed files with 5355 additions and 9349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/admin/default/admin-layout.tpl
View File

@@ -154,7 +154,7 @@
{loop name="menu-auth-coupon" type="auth" roles="ADMIN" permissions="admin.coupon.view"}
<li class="{if $admin_current_location == 'coupon'}active{/if}" id="coupon_menu">
<a href="{url path='/admin/coupon/'}">{intl l="Coupons"}</a>
<a href="{url path='/admin/coupon'}">{intl l="Coupons"}</a>
</li>
{/loop}