Fabien Potencier 504f1245e0 Merge branch '2.x' into 3.x ...

* 2.x:
  Fix docs
  Fixed doc markup
  Bump version to 2.12.3-DEV
  Prepare the 2.12.2 release
  Update CHANGELOG
  Bump version to 1.42.5-DEV
  Prepare the 1.42.4 release

2019-11-15 13:40:50 +01:00

..

filters

Merge branch '2.x' into 3.x

2019-11-15 13:40:50 +01:00

functions

Merge branch '2.x' into 3.x

2019-09-07 14:46:43 +02:00

tags

Merge branch '2.x' into 3.x

2019-07-12 09:13:14 +03:00

tests

…

advanced_legacy.rst

Merge branch '2.x' into 3.x

2019-06-30 14:55:01 +02:00

advanced.rst

Merge branch '2.x' into 3.x

2019-06-30 14:55:01 +02:00

api.rst

…

coding_standards.rst

…

deprecated.rst

…

index.rst

…

installation.rst

…

internals.rst

Merge branch '2.x' into 3.x

2019-06-20 14:04:29 +02:00

intro.rst

Twig 2 is compatible with PHP 7.0

2019-09-20 15:13:40 +02:00

recipes.rst

tweaked code

2019-07-12 09:11:27 +03:00

templates.rst

Merge branch '2.x' into 3.x

2019-08-20 10:38:25 +02:00