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

* 1.x:
  added some docs about the difference between the include tag and the include function

2019-02-15 04:22:01 +01:00

..

filters

Merge branch '1.x' into 2.x

2018-12-16 12:04:58 +01:00

functions

Merge branch '1.x' into 2.x

2019-01-08 17:28:13 +01:00

tags

Merge branch '1.x' into 2.x

2019-02-15 04:22:01 +01:00

tests

…

advanced.rst

Merge branch '1.x' into 2.x

2019-02-15 04:22:01 +01:00

api.rst

Merge branch '1.x' into 2.x

2019-01-08 17:28:13 +01:00

coding_standards.rst

…

deprecated.rst

deprecated Parser::isReservedMacroName()

2019-02-15 03:39:46 +01:00

index.rst

…

installation.rst

Added hint that the php c extension is only for php5

2018-12-16 22:09:22 +01:00

internals.rst

Merge branch '1.x' into 2.x

2019-01-08 17:28:13 +01:00

intro.rst

Merge branch '1.x' into 2.x

2019-01-08 17:28:13 +01:00

recipes.rst

Merge branch '1.x' into 2.x

2019-01-08 17:28:13 +01:00

templates.rst

Merge branch '1.x' into 2.x

2019-02-15 04:22:01 +01:00