Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/est/FrameworkBenchmarks i…
Browse files Browse the repository at this point in the history
…nto est-master
  • Loading branch information
pfalls-techempower committed May 3, 2013
2 parents d0240b8 + dd03c79 commit c918bc4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions django-stripped/hello/hello/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,10 @@

# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
('django.template.loaders.cached.Loader', (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
))
)

MIDDLEWARE_CLASSES = (
Expand Down
6 changes: 4 additions & 2 deletions django/hello/hello/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,10 @@

# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
('django.template.loaders.cached.Loader', (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
))
)

MIDDLEWARE_CLASSES = (
Expand Down

0 comments on commit c918bc4

Please sign in to comment.