Fabien Potencier e3b8a34023 Merge branch '1.x' into 2.x ...

* 1.x:
  Ensure that syntax errors are triggered with the right line
  fix a typo

2018-06-07 07:41:23 +02:00

..

filters

Merge branch '1.x' into 2.x

2018-05-18 09:25:34 +02:00

functions

Merge branch '1.x' into 2.x

2018-04-20 08:09:12 +02:00

tags

Merge branch '1.x' into 2.x

2018-05-18 09:25:34 +02:00

tests

…

advanced.rst

removed extra whitespaces

2018-04-20 08:09:57 +02:00

api.rst

…

coding_standards.rst

…

deprecated.rst

deprecated using the spaceless tag at the root level of a child template (noop anyway)

2018-05-18 12:56:53 +02:00

index.rst

…

installation.rst

Merge branch '1.x' into 2.x

2018-04-20 08:09:12 +02:00

internals.rst

Merge branch '1.x' into 2.x

2017-07-04 16:21:11 +03:00

intro.rst

…

recipes.rst

Merge branch '1.x' into 2.x

2018-04-20 08:09:12 +02:00

templates.rst

Merge branch '1.x' into 2.x

2018-06-07 07:41:23 +02:00