projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Updated Drupal to 8.6. This goes with the following updates because it's possible...
[yaffs-website]
/
vendor
/
twig
/
twig
/
doc
/
filters
/
merge.rst
diff --git
a/vendor/twig/twig/doc/filters/merge.rst
b/vendor/twig/twig/doc/filters/merge.rst
index 88780dd6ff63c5f461a316e84862d842e4016353..b0571f09daa208bef98bb93087ebe6130525939e 100644
(file)
--- a/
vendor/twig/twig/doc/filters/merge.rst
+++ b/
vendor/twig/twig/doc/filters/merge.rst
@@
-45,4
+45,4
@@
overridden.
Internally, Twig uses the PHP `array_merge`_ function. It supports
Traversable objects by transforming those to arrays.
-.. _`array_merge`: http
://
php.net/array_merge
+.. _`array_merge`: http
s://secure.
php.net/array_merge