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
..
__init__.py	Fixed #3011 -- Added swappable auth.User models.	2012-09-26 18:48:09 +08:00
_doctest.py	Advanced deprecation warnings for Django 1.7.	2013-06-29 18:49:37 +02:00
client.py	Fixed #13721 -- Added UploadedFile.content_type_extra.	2013-07-11 09:11:59 -04:00
html.py	Fixed spelling errors	2013-03-28 11:16:53 -06:00
runner.py	Merge branch 'master' into schema-alteration	2013-07-22 19:04:25 +01:00
signals.py	Fixed #19031 -- Added a warning when using override_settings with 'DATABASES'	2013-07-12 07:10:18 -04:00
simple.py	Removed tests for django.utils.unittest vs. unittest.	2013-07-01 21:49:11 +02:00
testcases.py	Fixed #18551 -- Enabled skipIfDBFeature/skipUnlessDBFeature to decorate a class	2013-07-19 20:30:14 +02:00
utils.py	Fixed #19031 -- Added a warning when using override_settings with 'DATABASES'	2013-07-12 07:10:18 -04:00