projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b94270 95353cb)
merged branch lyrixx/patch-1 (PR #1075)
authorFabien Potencier <fabien.potencier@gmail.com>
Mon, 6 May 2013 06:36:47 +0000 (08:36 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Mon, 6 May 2013 06:36:47 +0000 (08:36 +0200)
This PR was merged into the master branch.

Discussion
----------

Fixed php doc in Twig/Extension/StringLoader

Commits
-------

95353cb Fixed php doc in Twig/Extension/StringLoader


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