From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 27 Aug 2014 09:25:58 +0000 (+0200)
Subject: minor #1487 Added note about array_merge php function (pulzarraider)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=a4867487f245a95116de5736f02dd352024642eb;p=web%2Fkonrad%2Ftwig.git

minor #1487 Added note about array_merge php function (pulzarraider)

This PR was merged into the 1.16-dev branch.

Discussion
----------

Added note about array_merge php function

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT

Just a small doc improvement.

Commits
-------

f712b8f Added note about array_merge php function
---

a4867487f245a95116de5736f02dd352024642eb