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

Merge branch 'master' into modules

Browse Source 
Conflicts:
	templates/backOffice/default/product-edit.html
This commit is contained in:
Manuel Raynaud
2013-12-17 10:48:59 +01:00
parent 65f43b5eff e5576864cd
commit 0c24a8afc0
121 changed files with 4530 additions and 2203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/backOffice/default/search.html
View File

@@ -235,4 +235,8 @@
<script>
</script>
{/block}
{block name="javascript-last-call"}
{module_include location='search-js'}
{/block}