Fabien Potencier 4756b19b98 Merge branch '1.x' ...

* 1.x:
  fixed edge case where tests would fail because of a cache issue
  tweaked docs to avoid using an internal method in an example
  deprecated Twig_Environment::clearTemplateCache()
  fixed sandbox disabling when using the include function
  Example about how to rename several blocks
  fixed docs
  Update batch filter docs with arguments

2015-07-03 11:33:29 +02:00

..

Twig/Tests

Merge branch '1.x'

2015-07-03 11:33:29 +02:00