Fabien Potencier 8ae2062567 fixed bad merge

2015-09-13 13:26:49 +02:00

..

filters

Merge branch '1.x'

2015-09-06 08:47:52 +02:00

functions

Merge branch '1.x'

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

tags

removed deprecated _self variable

2015-08-12 16:52:40 +02:00

tests

Update empty.rst

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

advanced.rst

removed versionadded tags in docs

2015-09-06 08:49:46 +02:00

api.rst

Remove reference to String loader in docs

2015-07-06 15:43:15 -04: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

Merge branch '1.x'

2015-07-03 11:33:29 +02:00

intro.rst

Merge branch '1.x'

2015-08-12 16:46:07 +02:00

recipes.rst

fixed bad merge

2015-09-13 13:26:49 +02:00

templates.rst

OPcache support fix

2015-08-27 09:47:21 +02:00