projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39d94fa 59d0eed)
merged branch carlwitt/patch-1 (PR #1022)
authorFabien Potencier <fabien.potencier@gmail.com>
Thu, 7 Mar 2013 06:57:14 +0000 (07:57 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Thu, 7 Mar 2013 06:57:14 +0000 (07:57 +0100)
This PR was merged into the master branch.

Commits
-------

59d0eed Update merge.rst

Discussion
----------

Update merge.rst

Typo in first line:
The merge filter merges an array with [removed: the] another array


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