Andrew Godwin 6a632e0457 Merge branch 'master' into schema-alteration ...

Conflicts:
	django/db/backends/__init__.py
	django/db/models/fields/related.py
	django/db/models/options.py

2012-10-26 08:41:13 +01:00

..

modeltests

Merge branch 'master' into schema-alteration

2012-10-26 08:41:13 +01:00

regressiontests

Fixed test failure under Python 2.x introduced in 3e10d22df5

2012-10-26 02:45:15 +01:00

templates

Fixed #18807 -- Made 404.html and 500.html optional

2012-09-30 23:16:19 +02:00

.coveragerc

Fixed #16817 - Added a guide of code coverage to contributing docs.

2012-10-11 06:11:52 -04:00

runtests.py

Fixed #15552 -- LOGIN_URL and LOGIN_REDIRECT_URL can take URLpattern names.

2012-09-08 16:58:35 -06:00

test_sqlite.py

Use faster password hasher in sqlite tests

2012-04-30 22:10:27 +03:00

urls.py

Made sure the new project template functionality works when the template

2011-12-29 17:03:38 +00:00