Fabien Potencier 47c7be824f Merge branch '1.x' into 2.x ...

* 1.x:
  tweaked previous merge
  Enhances join filter for natural language join (i.e., \"A, B and C\")

2018-12-16 12:04:58 +01:00

..

filters

Merge branch '1.x' into 2.x

2018-12-16 12:04:58 +01:00

functions

…

tags

Merge branch '1.x' into 2.x

2018-09-27 16:33:35 +02:00

tests

…

advanced.rst

bumped versionn to 2.6

2018-07-31 11:41:48 +02:00

api.rst

…

coding_standards.rst

…

deprecated.rst

…

index.rst

…

installation.rst

…

internals.rst

…

intro.rst

Remove mention of the Twig C extension

2018-11-30 11:05:44 +11:00

recipes.rst

…

templates.rst

Merge branch '1.x' into 2.x

2018-11-30 07:25:29 +01:00