django1/django/db/models
Andrew Godwin 03ec3219a0 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
2013-07-22 19:04:25 +01:00
..
fields Merge branch 'master' into schema-alteration 2013-07-22 19:04:25 +01:00
sql Fixed #20746 -- Removed Python 2.6 specific code/docs 2013-07-14 13:02:55 -04:00
__init__.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00
aggregates.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00
base.py Merge branch 'master' into schema-alteration 2013-07-22 19:04:25 +01:00
constants.py Refactored qs.add_q() and utils/tree.py 2013-03-13 10:44:49 +02:00
deletion.py Fixed #19385 again, now with real code changes 2013-03-24 18:40:40 +02:00
expressions.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00
loading.py Merge branch 'master' into schema-alteration 2013-07-22 19:04:25 +01:00
manager.py Fixed #20429 -- Added QuerySet.update_or_create 2013-07-12 08:26:35 -04:00
options.py Merge branch 'master' into schema-alteration 2013-07-02 10:49:53 +01:00
query.py Fixed #20429 -- Added QuerySet.update_or_create 2013-07-12 08:26:35 -04:00
query_utils.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00
related.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00
signals.py Fixed #11398 - Added a pre_syncdb signal 2013-05-23 01:09:22 -04:00