Andrew Godwin b62e82365a Merge remote-tracking branch 'core/master' into schema-alteration ... Conflicts: django/db/models/loading.py django/db/models/options.py		2012-12-18 09:02:07 +00:00
..
__init__.py	MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions.	2006-05-02 01:31:56 +00:00
base.py	Merge remote-tracking branch 'core/master' into schema-alteration	2012-12-18 09:02:07 +00:00
client.py	Fixed #1142 -- Added multiple database support.	2009-12-22 15:18:51 +00:00
creation.py	Fixed #19162 -- Wrong indentation.	2012-10-22 19:23:19 +02:00
introspection.py	Fix introspection PK comment more.	2012-09-22 01:22:58 +01:00
schema.py	Fix nullability changing code	2012-09-24 12:56:17 +01:00