geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 20:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged branch carlwitt/patch-1 (PR #1022)

Browse Source 
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
This commit is contained in:
Fabien Potencier
2013-03-07 07:57:14 +01:00
parent 39d94faabc 59d0eed9f7
commit b6c2171579
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/filters/merge.rst
+1 -1
View File
@@ -1,7 +1,7 @@
``merge``
=========
The ``merge`` filter merges an array with the another array:
The ``merge`` filter merges an array with another array:
.. code-block:: jinja