Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

This commit is contained in:
Damien Metzger
2013-11-04 14:47:16 +01:00
169 changed files with 2783 additions and 1759 deletions
@@ -26,7 +26,6 @@
{extends file="helpers/view/view.tpl"}
{block name="override_tpl"}
<script type="text/javascript">
function saveCustomerNote()
{