summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMatthias Kestenholz <mk@feinheit.ch>2019-02-23 16:41:56 +0100
committerTim Graham <timograham@gmail.com>2019-02-27 17:16:58 -0500
commit459f7c804daf9ffb3bfecee13e078926cc324dd3 (patch)
tree6041e7891e9b5f323a9f5fcc4be366b30b3f77e7 /scripts
parent77e53da127cfb5d4f0c9a3540a02ff24f04fe9e2 (diff)
[2.2.x] Fixed #30179 -- Fixed form Media merging when pairwise merging is insufficient.
Thanks gasman for the tests, and codingjoe and timgraham for the review. Backport of 231b513926f2bfd71f08058ce5013bd81678ac01 from master.
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions