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

* 1.x:
  updated CHANGELOG
  fixed typo
  feature #2045 Adds Twig_NodeCaptureInterface for nodes that capture all output
  bumped version to 1.31.0
  Delay marking the environment as initialized until it is done
  Fix the argument name of filter replace

2017-01-10 14:07:32 -08:00

..

filters

Merge branch '1.x' into 2.x

2017-01-10 14:07:32 -08:00

functions

Merge branch '1.x' into 2.x

2016-12-23 09:06:20 +01:00

tags

Merge branch '1.x' into 2.x

2017-01-02 12:22:25 -08:00

tests

added 'is defined' support for block()

2016-11-11 12:03:32 -08:00

advanced.rst

fixed class names

2017-01-05 11:38:57 -08:00

api.rst

removed obsolete code

2016-11-15 17:01:14 -05:00

coding_standards.rst

Do not mix indention levels

2016-08-15 10:21:29 -07:00

deprecated.rst

added the missing deprecated doc

2017-01-05 09:36:31 -08:00

index.rst

…

installation.rst

feature #2318 removed remaining mentions of the C extension (fabpot)

2016-12-24 11:36:01 +01:00

internals.rst

removed obsolete code

2016-10-17 13:59:54 -07:00

intro.rst

dropped PHP 5.x support

2016-12-21 10:34:59 +01:00

recipes.rst

fixed class names

2017-01-05 11:38:57 -08:00

templates.rst

Merge branch '1.x' into 2.x

2016-11-10 11:33:40 -08:00