diff options
| author | Matthias Kestenholz <mk@feinheit.ch> | 2019-02-09 15:38:52 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2019-02-09 09:39:15 -0500 |
| commit | e1bd94496bcfe65c244bcd3ca668b900bf488326 (patch) | |
| tree | fe2e8272306c9d32abb1090c1836038516f89ce1 /tests/utils_tests/test_numberformat.py | |
| parent | d03e5961aa6555c7427bd054835733fe9c152dc0 (diff) | |
[2.2.x] Fixed #30153 -- Fixed incorrect form Media asset ordering after three way merge.
Delaying merging assets as long as possible avoids introducing
incorrect relative orderings that cause a broken final result.
Backport of 959d0c078a1c903cd1e4850932be77c4f0d2294d from master.
Diffstat (limited to 'tests/utils_tests/test_numberformat.py')
0 files changed, 0 insertions, 0 deletions