10000 Merge branch '3.2' · symfony/symfony@a97cdd6 · GitHub
[go: up one dir, main page]
Skip to content

Commit a97cdd6

Browse files
fabpotfabpot
committed
Merge branch '3.2'
* 3.2: fixed bad merge
2 parents 9b99fff + dd0ee1f commit a97cdd6

File tree

1 file changed

+1
-0
lines changed
  • src/Symfony/Bundle/TwigBundle/Resources/config

1 file changed

+1
-0
lines changed

‎src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<service id="twig.loader.native_filesystem" class="Twig_Loader_Filesystem" public="false">
4848
<argument type="collection" /> <!-- paths -->
4949
<argument /> <!-- project's root dir -->
50+
<tag name="twig.loader"/>
5051
</service>
5152

5253
<service id="twig.loader.chain" class="Twig_Loader_Chain" public="false"/>

0 commit comments

Comments
 (0)
0