diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2013-07-22 19:04:25 +0100 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2013-07-22 19:04:25 +0100 |
| commit | 03ec3219a04093da6c2e82436cee5c451df4f8aa (patch) | |
| tree | 69e3cc2857b7bc41f269363b0056b361129da118 /tests/admin_scripts/complex_app | |
| parent | 3a6580e485c11fc5502ffd1bb53347459db43421 (diff) | |
| parent | 29a09b3638e625458b5e07ed0956451432421acf (diff) | |
Merge branch 'master' into schema-alteration
Conflicts:
django/db/backends/mysql/introspection.py
django/db/backends/oracle/creation.py
django/db/backends/postgresql_psycopg2/creation.py
django/db/models/base.py
django/db/models/loading.py
Diffstat (limited to 'tests/admin_scripts/complex_app')
0 files changed, 0 insertions, 0 deletions