Fabien Potencier 253f3e8e88 Merge branch '1.x' into 2.x ...

* 1.x:
  made escaping on ternary expressions more fine-grained

2019-04-11 21:10:58 +02:00

..

filters

Merge branch '1.x' into 2.x

2019-04-11 21:10:58 +02:00

functions

Merge branch '1.x' into 2.x

2019-04-11 09:58:10 +02:00

tags

fix(with): comment some strings

2019-03-22 08:50:06 +01:00

tests

…

advanced.rst

…

api.rst

…

coding_standards.rst

…

deprecated.rst

added a note about Environment::resolveTemplate in 3.0

2019-03-15 17:40:37 +01:00

index.rst

…

installation.rst

…

internals.rst

…

intro.rst

…

recipes.rst

…

templates.rst

Merge branch '1.x' into 2.x

2019-04-03 16:42:51 +02:00