summaryrefslogtreecommitdiff
path: root/tests/migrations/test_migrations_conflict
Commit message (Expand)AuthorAgeFilesLines
* Refs #23919 -- Removed encoding preambles and future importsClaude Paroz2017-01-183-9/+0
* Fixed #21127 -- Started deprecation toward requiring on_delete for ForeignKey...Flavio Curella2015-07-271-1/+1
* Harmonized some PEP 0263 coding preamblesClaude Paroz2014-05-153-3/+3
* Fixed #22350 -- Consistently serialize bytes and text in migrations.Simon Charette2014-04-133-0/+9
* Migration VCS conflict detection and --merge for makemigrationsAndrew Godwin2013-12-044-0/+68