projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1e9802 bee4cd1)
merged branch Adel-E/update-api-docs (PR #858)
authorFabien Potencier <fabien.potencier@gmail.com>
Sat, 13 Oct 2012 19:01:24 +0000 (21:01 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Sat, 13 Oct 2012 19:01:24 +0000 (21:01 +0200)
This PR was merged into the master branch.

Commits
-------

bee4cd1 Update doc to correspond to the following: http://twig.sensiolabs.org/documentation http://twig.sensiolabs.org/doc/filters/escape.html

Discussion
----------

Update api docs

Update doc to correspond to the following:
http://twig.sensiolabs.org/documentation
http://twig.sensiolabs.org/doc/filters/escape.html

1  2 
doc/api.rst patch | diff1 | diff2 | blob | history

diff --cc doc/api.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.