diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2012-09-17 20:00:14 +0100 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2012-09-17 20:00:14 +0100 |
| commit | 9313dea7006ab77d54735fdd5825a812684e7144 (patch) | |
| tree | 3c4e67806b8805e41889d8f078d7c0cb2030a85d /scripts | |
| parent | dbf8b93c527733fb5e3ea101a67bd94db745888e (diff) | |
| parent | d21f3d9b171a3cbff4c8ce7a9dbb8b8be3f21bac (diff) | |
Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
django/db/backends/mysql/base.py
django/db/backends/postgresql_psycopg2/base.py
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions