1
0
mirror of https://github.com/django/django.git synced 2024-12-24 10:05:46 +00:00
Commit Graph

1 Commits

Author SHA1 Message Date
Andrew Godwin
3b8e46cbc7 Migration VCS conflict detection and --merge for makemigrations 2013-12-04 16:01:49 +00:00