Merge remote-tracking branch 'upstream/pull/2471'

[rails.git] / app / views / layouts / _head.html.erb

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 96f8d42a382b60b30406d95043993e8cd19682ff..a9d127835ebb097fd3de77735416e8c7c10502ba 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,6 +1,6 @@
 <%= content_tag :head, :data => application_data do %>
 <%= content_tag :head, :data => application_data do %>

-  <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-  <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0" />

   <%= javascript_include_tag "html5shiv" unless browser.html5? %>
   <%= javascript_include_tag "es5" unless browser.es5? %>
   <%= javascript_include_tag "es6" unless browser.es6? %>
   <%= javascript_include_tag "html5shiv" unless browser.html5? %>
   <%= javascript_include_tag "es5" unless browser.es5? %>
   <%= javascript_include_tag "es6" unless browser.es6? %>