Merge branch 'master' into modules

This commit is contained in:
Franck Allimant
2013-12-06 17:16:14 +01:00
316 changed files with 4064 additions and 1708 deletions

2
templates/backOffice/default/product-edit.html Normal file → Executable file
View File

@@ -108,7 +108,7 @@
</div>
<div class="tab-pane fade" id="modules">
<div class="text-center"><span class="loading">{intl l="Please wait, loading"}</span></div>
{module_include location='product-edit'}
</div>
</div>
</div>