django1/django
Andrew Godwin 5569b0b92f Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/models/signals.py
	tests/queries/tests.py
2013-08-23 12:36:53 +01:00
..
bin Removed daily_cleanup.py script as per deprecation TL. 2013-06-28 21:48:16 -03:00
conf Merge remote-tracking branch 'core/master' into schema-alteration 2013-08-23 12:36:53 +01:00
contrib Merge remote-tracking branch 'core/master' into schema-alteration 2013-08-23 12:36:53 +01:00
core Only create the migration directory once per app 2013-08-21 22:32:05 +01:00
db Merge remote-tracking branch 'core/master' into schema-alteration 2013-08-23 12:36:53 +01:00
dispatch Fixed #20943 -- Weakly reference senders when caching their associated receivers 2013-08-21 22:30:45 +01:00
forms Fixed model.__eq__ and __hash__ for no pk value cases 2013-08-22 17:24:07 +03:00
http Fixed #19987 -- Disabled host validation when DEBUG=True. 2013-07-31 10:38:59 -04:00
middleware Deprecated SortedDict (replaced with collections.OrderedDict) 2013-08-04 07:09:39 -04:00
shortcuts More import removals 2013-06-29 11:58:36 +02:00
template Fixed #20949 -- Typo #2 in docstring 2013-08-21 22:32:05 +01:00
templatetags Fixed #20130 -- Regression in {% cache %} template tag. 2013-03-30 12:13:08 +01:00
test Merge remote-tracking branch 'core/master' into schema-alteration 2013-08-19 18:30:48 +01:00
utils Avoid importing the deprecated `django.utils.importlib` package. 2013-08-21 22:30:02 +01:00
views Unlocalize line numbers and ids in debug 500 view. 2013-08-12 21:59:27 -03:00
__init__.py Master is now pre-1.7. 2013-06-28 08:56:45 -05:00