Fabien Potencier 56e515b64e Merge branch '1.x' ...

* 1.x:
  Fix two failed unit tests on Windows:
  updated CHANGELOG
  Reduce the name of the cache directories to 1 character
  clean ups
  bumped version to 1.18.2-DEV
  prepared the 1.18.1 release
  updated CHANGELOG
  Cleanup API - make the compiler happy
  Fixed memory leaks
  tweaked docs about the C extension
  removed an obsolete recipe

Conflicts:
	CHANGELOG
	doc/api.rst
	doc/recipes.rst
	ext/twig/php_twig.h
	lib/Twig/Environment.php
	lib/Twig/NodeTraverser.php
	lib/Twig/Template.php

2015-05-16 16:12:48 +02:00

..

filters

removed obsolete docs

2015-03-02 18:32:57 +01:00

functions

removed obsolete docs

2015-03-02 18:32:57 +01:00

tags

removed obsolete docs

2015-03-02 18:32:57 +01:00

tests

Update empty.rst

2015-05-11 10:01:11 +01:00

advanced.rst

removed obsolete docs

2015-03-02 18:32:57 +01:00

api.rst

Merge branch '1.x'

2015-05-16 16:12:48 +02:00

coding_standards.rst

…

index.rst

removed obsolete docs

2015-03-02 18:32:57 +01:00

installation.rst

Merge branch '1.x'

2015-05-16 16:12:48 +02:00

internals.rst

removed obsolete docs

2015-03-02 18:32:57 +01:00

intro.rst

removed the Autoloader as Composer provide one

2015-03-02 17:40:39 +01:00

recipes.rst

Merge branch '1.x'

2015-05-16 16:12:48 +02:00

templates.rst

removed obsolete docs

2015-03-02 18:32:57 +01:00