Fabien Potencier 74586e9f08 Revert "merged branch hason/macros (PR #1139)" ...

This reverts commit 03926034c4, reversing
changes made to 730aa25bed.

Conflicts:
	CHANGELOG
	doc/tags/macro.rst
	doc/templates.rst
	lib/Twig/ExpressionParser.php

2013-10-02 21:50:59 +02:00

..

filters

[Doc] corrects number_format argument namming

2013-09-29 16:14:18 +02:00

functions

fixed a typo in the docs (closes #1136)

2013-07-13 21:17:34 +02:00

tags

Revert "merged branch hason/macros (PR #1139)"

2013-10-02 21:50:59 +02:00

tests

…

advanced_legacy.rst

…

advanced.rst

grammar and punctuation fixes

2013-08-27 15:48:13 -07:00

api.rst

…

coding_standards.rst

Update wording of the indentation coding standards documentation

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

deprecated.rst

removed usage of deprecated constants

2013-08-05 18:25:53 +02:00

index.rst

simplified the intro doc page

2013-09-28 10:52:00 +02:00

installation.rst

simplified the intro doc page

2013-09-28 10:52:00 +02:00

internals.rst

fixed markup

2013-08-28 08:01:53 +02:00

intro.rst

tweaked intro chapter

2013-09-28 10:52:29 +02:00

recipes.rst

…

templates.rst

Revert "merged branch hason/macros (PR #1139)"

2013-10-02 21:50:59 +02:00