dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kevin Granger
2013-12-11 16:56:12 +01:00
parent 36968d76b6 3249a6bd99
commit b9db5d5023
101 changed files with 876 additions and 1733 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default-bootstrap/header.tpl
+2 -2
View File
@@ -31,10 +31,10 @@
<head>
<title>{$meta_title|escape:'html':'UTF-8'}</title>
{if isset($meta_description) AND $meta_description}
<meta name="description" content="{$meta_description|escape:html:'UTF-8'}" />
<meta name="description" content="{$meta_description|escape:'html':'UTF-8'}" />
{/if}
{if isset($meta_keywords) AND $meta_keywords}
<meta name="keywords" content="{$meta_keywords|escape:html:'UTF-8'}" />
<meta name="keywords" content="{$meta_keywords|escape:'html':'UTF-8'}" />
{/if}
<meta charset="utf-8" />
<meta name="generator" content="PrestaShop" />