django1/django/contrib
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
..
admin Revert "Changed admin/templates/admin/index.html to make <caption> translatable" 2013-12-20 15:19:03 +01:00
admindocs Fixed #21386 -- Removed admindocs dependence on sites framework 2013-12-18 19:44:04 +01:00
auth Moved the new app cache inside core. 2013-12-17 10:17:46 +01:00
comments Moved the new app cache inside core. 2013-12-17 10:17:46 +01:00
contenttypes Merge branch 'master' into lookups_3 2013-12-21 22:53:10 +02:00
flatpages Fixed E127 pep8 warnings. 2013-12-14 11:59:15 -05:00
formtools Removed superfluous models.py files. 2013-12-17 11:16:48 +01:00
gis Merge branch 'master' into lookups_3 2013-12-21 22:53:10 +02:00
humanize Removed superfluous models.py files. 2013-12-17 11:16:48 +01:00
messages Removed superfluous models.py files. 2013-12-17 11:16:48 +01:00
redirects Fixed #21388 -- Corrected language code for Frisian 2013-11-11 13:34:01 +01:00
sessions Fixed E127 pep8 warnings. 2013-12-14 11:59:15 -05:00
sitemaps Normalized Model._meta.installed. 2013-12-17 21:55:16 +01:00
sites Normalized Model._meta.installed. 2013-12-17 21:55:16 +01:00
staticfiles Removed superfluous models.py files. 2013-12-17 11:16:48 +01:00
syndication Fixed flake8 E251 violations 2013-11-03 03:22:11 -06:00
webdesign Removed superfluous models.py files. 2013-12-17 11:16:48 +01:00
__init__.py Created django.contrib and moved comments into it 2005-07-14 18:20:03 +00:00