Andrew Godwin 9daf81b94e Merge remote-tracking branch 'core/master' into schema-alteration ... Conflicts: django/db/models/loading.py		2013-06-19 12:05:23 +01:00
..
__init__.py	Merge remote-tracking branch 'core/master' into schema-alteration	2013-06-19 12:05:23 +01:00
files.py	Add a deconstruct() method to Fields.	2013-05-18 13:48:57 +02:00
proxy.py	Fixed #13328 -- Ensured that querysets on models with callable defaults can be pickled. No, really this time. Thanks to Alex for his help brainstorming the solution.	2010-04-21 16:34:33 +00:00
related.py	Merge remote-tracking branch 'core/master' into schema-alteration	2013-06-19 12:05:23 +01:00
subclassing.py	[py3] Removed a remaining use of __metaclass__.	2012-08-14 23:45:12 +02:00