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
..
backends	Merge branch 'master' into schema-alteration	2013-07-22 19:04:25 +01:00
migrations	Add AlterIndexTogether operation	2013-07-02 18:02:01 +01:00
models	Merge branch 'master' into schema-alteration	2013-07-22 19:04:25 +01:00
__init__.py	A large number of stylistic cleanups across django/db/	2013-07-08 10:39:54 +10:00
transaction.py	A large number of stylistic cleanups across django/db/	2013-07-08 10:39:54 +10:00
utils.py	Removed some conditional code only needed under Python 2.6.	2013-07-01 12:02:17 +02:00