Merge remote-tracking branch 'origin/master'

diff --git a/lib/template/header.php b/lib/template/header.php
index 3c2af8361df84aa4c32d9c7a10ada3499fe0078b..5a365b90a6dafaa59ddd8d5408b3e532ebc9fdb0 100644 (file)
--- a/lib/template/header.php
+++ b/lib/template/header.php
@@ -5,9 +5,12 @@ $content_type = 'text/html; charset=utf-8';
 
 if (isset ($_SERVER['HTTP_ACCEPT']) &&
     stristr ($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml'))
+{
     $content_type = 'application/xhtml+xml; charset=utf-8';
+}
 
 header('Content-Type: ' . $content_type);
+header('x-ua-compatible: ie=edge');
 
 $protocol = (bool)is_ssl() ? 'https' : 'http';