mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-18 15:34:16 +00:00
Code Issues 24 Releases Wiki Activity
17,957 Commits 28 Branches 423 Tags 636 MiB
aa12ea05ce
Commit Graph

3 Commits

Author SHA1 Message Date
Claude Paroz
e520a73eee Harmonized some PEP 0263 coding preambles 2014-05-15 19:58:41 +02:00
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