django1/django
Andrew Godwin 3c296382b8 Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
	django/db/models/fields/related.py
2013-06-07 11:15:34 +01:00
..
bin Fixed -- Added support for wheel packages. 2013-05-01 13:46:06 +02:00
conf Merge pull request from erikr/better-settings-errors2 2013-05-27 01:08:18 -07:00
contrib Fixed (again) -- More i18n cache flush in tests 2013-06-06 14:28:58 +02:00
core Merge remote-tracking branch 'core/master' into schema-alteration 2013-06-07 11:15:34 +01:00
db Merge remote-tracking branch 'core/master' into schema-alteration 2013-06-07 11:15:34 +01:00
dispatch Fixed -- Added proper __hash__ methods. 2013-02-25 23:05:20 +01:00
forms Fixed - Honor ModelForm.Meta.exclude when saving ManyToManyFields. 2013-06-06 10:01:48 -04:00
http Fixed -- Wrapped request.FILES read error in UnreadablePostError 2013-06-01 10:26:46 +02:00
middleware Replaced `and...or...` constructs with PEP 308 conditional expressions. 2013-05-26 23:47:50 -03:00
shortcuts Fixed -- Completed deprecation of mimetype in favor of content_type. 2013-01-31 13:54:40 +01:00
template Fixed -- Added non-breaking spaces between values an units 2013-05-18 23:01:48 +02:00
templatetags Fixed -- Regression in {% cache %} template tag. 2013-03-30 12:13:08 +01:00
test Fixed -- Made test.Client.logout send user_logged_out signal. 2013-06-04 12:39:09 -04:00
utils Merge remote-tracking branch 'core/master' into schema-alteration 2013-06-07 11:15:34 +01:00
views Merge pull request from intgr/debug_no_exc_message 2013-05-30 09:53:07 -07:00
__init__.py Bumped verion numbers for 1.6a1. 2013-06-06 11:05:33 -05:00