Arthur de Jong

Open Source / Free Software developer

summaryrefslogtreecommitdiffstats
path: root/tests/migrations/test_migrations_conflict
Commit message (Expand)AuthorAgeFilesLines
* Fixed #21127 -- Started deprecation toward requiring on_d...Flavio Curella2015-07-281-1/+1
* Harmonized some PEP 0263 coding preamblesClaude Paroz2014-05-153-3/+3
* Fixed #22350 -- Consistently serialize bytes and text in ...Simon Charette2014-04-143-0/+9
* Migration VCS conflict detection and --merge for makemigr...Andrew Godwin2013-12-044-0/+68