django1/django/db/models/fields
Andrew Godwin de64c4d6e9 Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
	django/core/management/commands/flush.py
	django/core/management/commands/syncdb.py
	django/db/models/loading.py
	docs/internals/deprecation.txt
	docs/ref/django-admin.txt
	docs/releases/1.7.txt
2013-08-09 14:17:30 +01:00
..
__init__.py Merge remote-tracking branch 'core/master' into schema-alteration 2013-08-09 14:17:30 +01:00
files.py Fixed #20348 -- Consistently handle Promise objects in model fields. 2013-07-31 15:54:17 +03:00
proxy.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00
related.py Merge remote-tracking branch 'core/master' into schema-alteration 2013-08-09 14:17:30 +01:00
subclassing.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00