Merge branch '3.2'

* 3.2:
  fixed bad merge
This commit is contained in:
Fabien Potencier 2017-01-08 13:20:52 -08:00
commit a97cdd63a2

View File

@ -47,6 +47,7 @@
<service id="twig.loader.native_filesystem" class="Twig_Loader_Filesystem" public="false">
<argument type="collection" /> <!-- paths -->
<argument /> <!-- project's root dir -->
<tag name="twig.loader"/>
</service>
<service id="twig.loader.chain" class="Twig_Loader_Chain" public="false"/>