django1/django
Anssi Kääriäinen 049eebc070 Merge branch 'master' into lookups_3
Conflicts:
	django/db/models/fields/__init__.py
	django/db/models/sql/compiler.py
	django/db/models/sql/query.py
	tests/null_queries/tests.py
2013-12-21 22:53:10 +02:00
..
bin Started attackign the next flake8 violation 2013-10-31 08:42:28 -07:00
conf Simplied some code in django.conf.__init__. 2013-12-18 18:23:25 -05:00
contrib Merge branch 'master' into lookups_3 2013-12-21 22:53:10 +02:00
core Style cleanup forgotten in second previous commit. 2013-12-17 22:24:25 +01:00
db Merge branch 'master' into lookups_3 2013-12-21 22:53:10 +02:00
dispatch Fixed E127 pep8 warnings. 2013-12-14 11:59:15 -05:00
forms Refs #17413 -- Added isinstance backward compatibility on ErrorList. 2013-12-18 08:59:53 -05:00
http Fixed E127 pep8 warnings. 2013-12-14 11:59:15 -05:00
middleware Fixed #21473 -- Limited language preservation to logout 2013-12-12 10:24:43 +01:00
template Small flake8 fixes -- number of blank lines between top level definitions 2013-12-19 20:43:34 -08:00
templatetags A handful of flake8 fixes 2013-11-23 08:26:11 -08:00
test Set stacklevel for the override_settings warning. 2013-12-20 11:09:06 +01:00
utils Removed unnecessary function-level import. 2013-12-16 15:30:51 +01:00
views Fixed #21564 -- Use local request object when possible in generic views. 2013-12-16 16:58:08 +01:00
__init__.py Started attackign the next flake8 violation 2013-10-31 08:42:28 -07:00
shortcuts.py Changed shortcuts from being a package to just being a module 2013-11-19 15:34:20 -08:00