django-bot 6a682b38e7 [4.0.x] Refs #33476 -- Reformatted code with Black. ...

Backport of 9c19aff7c7561e3a82978a272ecdaad40dda5c00 from main.

2022-02-08 12:15:38 +01:00

..

__init__.py

Migration VCS conflict detection and --merge for makemigrations

2013-12-04 16:01:49 +00:00

0001_initial.py

[4.0.x] Refs #33476 -- Reformatted code with Black.

2022-02-08 12:15:38 +01:00

0002_conflicting_second.py

[4.0.x] Refs #33476 -- Reformatted code with Black.

2022-02-08 12:15:38 +01:00

0002_second.py

[4.0.x] Refs #33476 -- Reformatted code with Black.

2022-02-08 12:15:38 +01:00