diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2013-12-04 16:01:31 +0000 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2013-12-04 16:01:49 +0000 |
| commit | 3b8e46cbc7cdb03bb40b3b099997a5f659a2d402 (patch) | |
| tree | 6e41e1975148bf9b4f068305acc21a5d07640c35 /docs | |
| parent | cd9e85ece94214718257d972e9e5ab4bac3f0e65 (diff) | |
Migration VCS conflict detection and --merge for makemigrations
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions