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

Conflicts: classes/helper/HelperForm.php classes/helper/HelperUploader.php
2013-10-25 18:58:07 +02:00
parent 03857c0576 8b1f9d0560
commit 39f6a2354a
14 changed files with 238 additions and 238 deletions
@@ -36,7 +36,7 @@
 				{if $key == 'legend'}
 					<h3>
 						{if isset($field.image)}<img src="{$field.image}" alt="{$field.title|escape:'htmlall':'UTF-8'}" />{/if}
-						{if isset($field.icon)}<i class="{$field.icon}"/></i>{/if}
+						{if isset($field.icon)}<i class="{$field.icon}"></i>{/if}
 						{$field.title}
 					</h3>
 				{elseif $key == 'description' && $field}