Andrew Godwin b6a957f0ba Merge remote-tracking branch 'core/master' into schema-alteration ...

Conflicts:
	docs/ref/django-admin.txt

2013-08-19 18:30:48 +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 #20864 -- Made the test client use common method for performing requests.

2013-08-13 19:08:13 -04:00

html.py

Fixed spelling errors

2013-03-28 11:16:53 -06:00

runner.py

Docs tweaks (thanks timgraham)

2013-08-10 20:00:12 +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

Deprecated django.utils.importlib

2013-07-29 17:10:22 +02:00

testcases.py

Rename pre_ and post_syncdb to *_migrate, with aliases from old names

2013-07-30 11:52:52 +01:00

utils.py

Fixed #19031 -- Added a warning when using override_settings with 'DATABASES'

2013-07-12 07:10:18 -04:00