Fabien Potencier fe67c5ba3a Merge branch '1.x' ...

* 1.x:
  updated CHANGELOG
  reverted unexpected change
  fixed previous merge
  Organize and show value types
  Added label for "Whitespace Control" section
  Added note about case sensitivity of logic operators
  Fixed CS
  Fixed error guessing for nested templates
  Travis no longer supports hhvm-nightly
  fixed CS
  Added an example for "and" on if statment
  Updated exception messages for null vars in Twig_Template::getAttribute().
  Use stubs for profiles. Fixes #1660

Conflicts:
	doc/api.rst

2015-06-07 01:29:09 +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

Merge branch '1.x'

2015-06-07 01:29:09 +02: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-06-07 01:29:09 +02:00

coding_standards.rst

Update wording of the indentation coding standards documentation

2013-09-27 16:32:11 +01:00

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

Merge branch '1.x'

2015-06-07 01:29:09 +02:00