mirror of
https://github.com/django/django.git
synced 2025-10-27 15:46:10 +00:00
Conflicts:
tests/apps/tests.py
tests/migrations/test_graph.py
tests/queryset_pickle/tests.py
tests/runtests.py
Backport of 1c5f4e86bc from master