django/tests/multiple_database
Andrew Godwin de64c4d6e9 Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
	django/core/management/commands/flush.py
	django/core/management/commands/syncdb.py
	django/db/models/loading.py
	docs/internals/deprecation.txt
	docs/ref/django-admin.txt
	docs/releases/1.7.txt
2013-08-09 14:17:30 +01:00
..
fixtures 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
models.py Removed most of absolute_import imports 2013-07-29 20:28:13 +02:00
tests.py Merge remote-tracking branch 'core/master' into schema-alteration 2013-08-09 14:17:30 +01:00