Merge branch 'master' into multi

Conflicts:
	docs/TODO
This commit is contained in:
Roberto Rosario
2011-03-16 04:59:31 -04:00
8 changed files with 30 additions and 19 deletions
+1 -1
View File
@@ -70,7 +70,7 @@ def document_list(request):
return object_list(
request,
queryset=Document.objects.all(),
queryset=Document.objects.only('file_filename', 'file_filename', 'file_extension').all(),
template_name='generic_list.html',
extra_context={
'title':_(u'documents'),