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

* 1.x:
  Update .travis.yml
  fiwed internal link
  Make sure twig_include returns a string

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

..

filters

Merge branch '1.x' into 2.x

2018-11-30 07:25:29 +01: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-09-27 16:33:35 +02:00

tests

Merge branch '1.x' into 2.x

2017-03-22 08:12:17 -07:00

advanced.rst

bumped versionn to 2.6

2018-07-31 11:41:48 +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

Remove mention of the Twig C extension

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

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-11-30 07:25:29 +01:00