Fabien Potencier abea992e76 Merge branch '2.x' into 3.x ...

* 2.x:
  [Doc] Minor fixes and removed belittling words
  fixed CHANGELOG
  bumped version to 2.11.4-DEV
  prepared the 2.11.3 release
  bumped version to 1.42.3-DEV
  prepared the 1.42.2 release

2019-06-20 14:04:29 +02:00

..

filters

Merge branch '2.x' into 3.x

2019-06-20 14:04:29 +02:00

functions

…

tags

Merge branch '2.x' into 3.x

2019-06-20 14:04:29 +02:00

tests

…

advanced.rst

Merge branch '2.x' into 3.x

2019-06-20 14:04:29 +02:00

api.rst

Merge branch '2.x' into 3.x

2019-05-25 12:24:55 +02:00

coding_standards.rst

…

deprecated.rst

deprecated CoreExtension::setEscaper() and CoreExtension::getEscaper() in favor of the same methods on EscaperExtension

2019-05-21 09:01:26 +02:00

index.rst

…

installation.rst

…

internals.rst

Merge branch '2.x' into 3.x

2019-06-20 14:04:29 +02:00

intro.rst

Merge branch '2.x' into 3.x

2019-04-27 16:57:20 +01:00

recipes.rst

Merge branch '1.x' into 2.x

2019-06-20 13:56:08 +02:00

templates.rst

Merge branch '2.x' into 3.x

2019-05-22 16:00:25 +02:00