1
0
mirror of https://github.com/django/django.git synced 2025-04-17 22:04:38 +00:00
Matthias Kestenholz e1bd94496b [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.
2019-02-09 09:39:15 -05:00
..
2019-01-16 20:51:26 +01:00