mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-05-10 08:56:29 +00:00
Code Issues 32 Releases Wiki Activity
18,465 Commits 29 Branches 444 Tags
Commit Graph

3 Commits

Author SHA1 Message Date
Claude Paroz
e8a7436941 [1.7.x] Harmonized some PEP 0263 coding preambles 
Backport of e520a73ee from master.
 2014-05-15 20:01:31 +02:00
Simon Charette
9fb61cb64a [1.7.x] Fixed #22350 -- Consistently serialize bytes and text in migrations. 
Thanks to @treyhunner and Loïc for their suggestions and review.

Backport of 72d3889db4 from master
 2014-04-13 19:03:20 -04:00
Andrew Godwin
3b8e46cbc7 Migration VCS conflict detection and --merge for makemigrations 2013-12-04 16:01:49 +00:00