diff options
author | Marc Alexander <admin@m-a-styles.de> | 2015-07-08 22:54:26 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2015-07-08 22:54:26 +0200 |
commit | 01097a24b50a6ffa0662740bbf418399ed5623f2 (patch) | |
tree | 243924516f0af98657026b19fb90b8a6edcda5cf /phpBB/phpbb | |
parent | 2fbfb0e00436acc090a55e1739cf8bdd3b5c4497 (diff) | |
parent | f576f42b4d3c607aee6b30154502adfed79301fb (diff) | |
download | forums-01097a24b50a6ffa0662740bbf418399ed5623f2.tar forums-01097a24b50a6ffa0662740bbf418399ed5623f2.tar.gz forums-01097a24b50a6ffa0662740bbf418399ed5623f2.tar.bz2 forums-01097a24b50a6ffa0662740bbf418399ed5623f2.tar.xz forums-01097a24b50a6ffa0662740bbf418399ed5623f2.zip |
Merge branch '3.1.x'
Conflicts:
tests/template/template_includecss_test.php
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r-- | phpBB/phpbb/template/twig/node/includecss.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php index 2ce63402aa..2dac154036 100644 --- a/phpBB/phpbb/template/twig/node/includecss.php +++ b/phpBB/phpbb/template/twig/node/includecss.php @@ -31,7 +31,7 @@ class includecss extends \phpbb\template\twig\node\includeasset $compiler ->raw("<link href=\"' . ") ->raw("\$asset_file . '\"") - ->raw(' rel="stylesheet" type="text/css" media="screen, projection" />') + ->raw(' rel="stylesheet" type="text/css" media="screen" />') ; } } |