mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-15 04:45:51 +00:00
Code Issues 32 Releases Wiki Activity
17,732 Commits 28 Branches 429 Tags
Commit Graph

2 Commits

Author SHA1 Message Date
Simon Charette
72d3889db4 Fixed #22350 -- Consistently serialize bytes and text in migrations. 
Thanks to @treyhunner and Loïc for their suggestions and review.
 2014-04-13 18:22:26 -04:00
Andrew Godwin
3b8e46cbc7 Migration VCS conflict detection and --merge for makemigrations 2013-12-04 16:01:49 +00:00