Aymeric Augustin 115318051c [1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0. ...

Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/base.py

Backport of 365c3e8b from master.

2013-09-03 07:34:45 -05:00

..

fixtures

Merged regressiontests and modeltests into the test root.

2013-02-26 14:36:57 +01:00

templates/template_used

Merged regressiontests and modeltests into the test root.

2013-02-26 14:36:57 +01:00

__init__.py

Merged regressiontests and modeltests into the test root.

2013-02-26 14:36:57 +01:00

doctest_output.py

[1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0.

2013-09-03 07:34:45 -05:00

models.py

Merged regressiontests and modeltests into the test root.

2013-02-26 14:36:57 +01:00

tests.py

Fixed #20548 -- Removed all PendingDeprecationWarnings from django test suite

2013-06-14 15:37:39 +01:00

urls.py

Merged regressiontests and modeltests into the test root.

2013-02-26 14:36:57 +01:00

views.py

Merged regressiontests and modeltests into the test root.

2013-02-26 14:36:57 +01:00