projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3999169 742043f)
merged branch ThatGuyBen/patch-1 (PR #1048)
authorFabien Potencier <fabien.potencier@gmail.com>
Mon, 8 Apr 2013 12:10:12 +0000 (14:10 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Mon, 8 Apr 2013 12:10:12 +0000 (14:10 +0200)
This PR was merged into the master branch.

Discussion
----------

Update json_encode.rst

a more-useful description of the "options" argument >_>

Commits
-------

742043f Update json_encode.rst


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.