Fabien Potencier 1327db55e9 Merge branch '2.x' into 3.x ...

* 2.x:
  Update format_time.rst
  Fix "include(template_from_string())"
  Fix PHPUnit config

2020-10-27 15:15:09 +01:00

..

filters

Merge branch '2.x' into 3.x

2020-10-27 15:15:09 +01:00

functions

Merge branch '2.x' into 3.x

2020-10-21 14:27:08 +02:00

tags

Merge branch '2.x' into 3.x

2020-10-21 12:25:26 +02:00

tests

Fix versionadded in doc

2020-01-11 12:21:32 +01:00

advanced.rst

Merge branch '2.x' into 3.x

2020-03-24 13:35:36 +01:00

api.rst

Merge branch '2.x' into 3.x

2020-04-24 08:31:57 +02:00

coding_standards.rst

…

deprecated.rst

Deprecation documentation indentation

2020-05-17 14:50:59 +01:00

index.rst

…

installation.rst

…

internals.rst

…

intro.rst

Merge branch '1.x' into 2.x

2020-10-21 12:24:53 +02:00

recipes.rst

Added return and argument type for LoaderInterface

2020-08-01 09:02:27 +02:00

templates.rst

Merge branch '2.x' into 3.x

2020-08-23 14:02:58 +02:00