Skip to content
Browse files

Merge remote-tracking branch 'kyle/master'

Conflicts:
	vendor/scaffold/src/tmpl/base.tmpl
  • Loading branch information...
2 parents 644c87a + fa10136 commit b212d52d207c1a17113a30bab029f58bf6160f46 Ryan J Daw committed Jul 10, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 vendor/scaffold/src/tmpl/base.tmpl
View
2 vendor/scaffold/src/tmpl/base.tmpl
@@ -57,7 +57,7 @@ Below is your base template file, which is extended by home.tmpl:
{+head}
{$head|innerHTML|s}
<link rel="stylesheet" href="{config.configDir}style.css" />
- <meta name="viewport" content="width=device-width; initial-scale=1.0; minimum-scale=1.0; maximum-scale=1.0; user-scalable=no;" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
{/head}
</head>
{$body|openTag|s}

0 comments on commit b212d52

Please sign in to comment.
Something went wrong with that request. Please try again.