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

This commit is contained in:
Damien Metzger committed 2013-11-04 14:47:16 +01:00
commit 27273334e3
169 files changed
+2783 -1759

No files matched your search

@@ -26,7 +26,6 @@
{extends file="helpers/view/view.tpl"}
{block name="override_tpl"}
<script type="text/javascript">
function saveCustomerNote()
{