From cbd0525f8f5c4fa71caf4a6183dbb8cf61256cbc Mon Sep 17 00:00:00 2001 From: Bilal Amarni Date: Sun, 31 Mar 2013 20:32:41 +0200 Subject: [PATCH] used HTML5 meta charset tag and removed hardcoded ones Conflicts: src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Resources/views/base.html.twig src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.html.twig src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig --- .../Tests/Functional/app/Resources/views/base.html.twig | 2 +- .../TwigBundle/Resources/views/Exception/error.html.twig | 2 +- .../WebProfilerBundle/Resources/views/Profiler/base.html.twig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Resources/views/base.html.twig b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Resources/views/base.html.twig index 4b9151eaf8..58ba1fe89e 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Resources/views/base.html.twig +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Resources/views/base.html.twig @@ -1,7 +1,7 @@ - + {% block title %}Welcome!{% endblock %} {% block stylesheets %}{% endblock %} diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.html.twig index 30b51e4760..138a60ad96 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.html.twig @@ -1,7 +1,7 @@ - + An Error Occurred: {{ status_text }} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig index e4258a205d..3567708a72 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig @@ -1,8 +1,8 @@ - - + + {% block title 'Profiler' %}