Merge pull request Sylius#9779 from pamil/1.3-templates-bundles

Fix error templates path
Shasthojoy · Oct 5, 2018 · 4663016 · 4663016
2 parents ccc4707 + 196eff8
commit 4663016
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -18,7 +18,7 @@
 /node_modules
 
 /etc/build/*
-!/etc/build/.gitkeep
+!/etc/build/.gitignore
 
 /behat.yml
 /phpspec.yml

diff --git a/etc/build/.gitkeep → etc/build/.gitignore b/etc/build/.gitkeep → etc/build/.gitignore
diff --git a/templates/.gitkeep → templates/.gitignore b/templates/.gitkeep → templates/.gitignore
diff --git a/...ndle/TwigBundle/Exception/error.html.twig → ...dles/TwigBundle/Exception/error.html.twig b/...ndle/TwigBundle/Exception/error.html.twig → ...dles/TwigBundle/Exception/error.html.twig
diff --git a/...e/TwigBundle/Exception/error404.html.twig → ...s/TwigBundle/Exception/error404.html.twig b/...e/TwigBundle/Exception/error404.html.twig → ...s/TwigBundle/Exception/error404.html.twig
diff --git a/...e/TwigBundle/Exception/error500.html.twig → ...s/TwigBundle/Exception/error500.html.twig b/...e/TwigBundle/Exception/error500.html.twig → ...s/TwigBundle/Exception/error500.html.twig