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

* 1.x:
  Updated the vim-twig link
  PHPUnit 6 compatability
  Fix codeblock
  Update Compiler.php

2017-03-12 08:30:20 -07:00

..

filters

Merge branch '1.x' into 2.x

2017-02-23 06:55:46 -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

tweaked docs

2017-02-17 11:35:58 -08:00

api.rst

removed obsolete code

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

coding_standards.rst

…

deprecated.rst

fixed CS

2017-02-03 13:30:43 -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

…

intro.rst

Change '~' with '^' for version in composer require

2017-02-16 09:57:42 +02:00

recipes.rst

Merge branch '1.x' into 2.x

2017-03-12 08:30:20 -07:00

templates.rst

Merge branch '1.x' into 2.x

2017-03-12 08:30:20 -07:00