// REVERT MERGE

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie committed 2011-07-27 13:35:06 +00:00
1 parent e159c925d8
commit be4811aa6e
182 files changed
+1335 -6181

No files matched your search

+1 -1
View File
@@ -392,7 +392,7 @@ $(function(){ldelim}
<label for="address1">{l s='Address'}</label>
<input type="text" class="text" name="address1" id="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{/if}" />
<sup>*</sup>
<span class="inline-infos">{l s='Street address, P.O. box, company name, c/o'}</span>
<span class="inline-infos">{l s='Street address, P.O. box, compagny name, c/o'}</span>
</p>
{elseif $field_name eq "address2"}
<p class="text">