Arthur de Jong

Open Source / Free Software developer

summaryrefslogtreecommitdiffstats
path: root/tests/migrations/test_migrations_conflict/0001_initial.py
Commit message (Collapse)AuthorAgeFilesLines
* Harmonized some PEP 0263 coding preamblesClaude Paroz2014-05-151-1/+1
|
* Fixed #22350 -- Consistently serialize bytes and text in ↵Simon Charette2014-04-141-0/+3
| | | | | | migrations. Thanks to @treyhunner and Loïc for their suggestions and review.
* Migration VCS conflict detection and --merge for ↵Andrew Godwin2013-12-041-0/+27
makemigrations