projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f5b998 1b3ac0a)
minor #1409 Update json_encode.rst (matthieuprat)
authorFabien Potencier <fabien.potencier@gmail.com>
Sun, 25 May 2014 23:53:41 +0000 (01:53 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Sun, 25 May 2014 23:53:41 +0000 (01:53 +0200)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Update json_encode.rst

Commits
-------

1b3ac0a Update json_encode.rst


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