p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
django/tests/migrations/test_migrations_conflict
History
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
..
0001_initial.py Fixed #22350 -- Consistently serialize bytes and text in migrations. 2014-04-13 18:22:26 -04:00
0002_conflicting_second.py Fixed #22350 -- Consistently serialize bytes and text in migrations. 2014-04-13 18:22:26 -04:00
0002_second.py Fixed #22350 -- Consistently serialize bytes and text in migrations. 2014-04-13 18:22:26 -04:00
__init__.py Migration VCS conflict detection and --merge for makemigrations 2013-12-04 16:01:49 +00:00