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

* 1.x:
  Environment::resolveTemplate now accepts instances of TemplateWrapper
  Change typo in documentation
  fix grammar

2017-11-12 10:45:51 -08:00

..

attribute.rst

…

block.rst

Merge branch '1.x' into 2.x

2017-11-12 10:45:51 -08:00

constant.rst

added missing docs

2016-11-12 17:36:55 -08:00

cycle.rst

…

date.rst

removed obsolete features

2016-09-28 10:49:38 -07:00

dump.rst

…

include.rst

removed obsolete code

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

index.rst

…

max.rst

…

min.rst

…

parent.rst

…

random.rst

…

range.rst

add a comma to clarify the meaning

2016-12-23 08:52:50 +01:00

source.rst

Merge branch '1.x'

2015-07-03 12:14:51 +02:00

template_from_string.rst

…