diff options
| author | Steve Piercy <web@stevepiercy.com> | 2013-10-08 16:51:24 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2013-10-08 16:51:24 -0700 |
| commit | 7f7d86e1e767f0339266d00c3a4723477add28b5 (patch) | |
| tree | d474b33ec2320f5849d35d54e5e96c2b00daeced /docs/quick_tutorial/jinja2 | |
| parent | 6b2e8ee2a63f601a1708c0e74e6ea5b3551507f1 (diff) | |
| parent | d7f8766ef2154c64b9fc040e5bf0a8249e5c366f (diff) | |
| download | pyramid-7f7d86e1e767f0339266d00c3a4723477add28b5.tar.gz pyramid-7f7d86e1e767f0339266d00c3a4723477add28b5.tar.bz2 pyramid-7f7d86e1e767f0339266d00c3a4723477add28b5.zip | |
Merge branch 'origin/master'
Diffstat (limited to 'docs/quick_tutorial/jinja2')
| -rw-r--r-- | docs/quick_tutorial/jinja2/development.ini | 1 | ||||
| -rw-r--r-- | docs/quick_tutorial/jinja2/tutorial/__init__.py | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/docs/quick_tutorial/jinja2/development.ini b/docs/quick_tutorial/jinja2/development.ini index c096fa936..62e0c5123 100644 --- a/docs/quick_tutorial/jinja2/development.ini +++ b/docs/quick_tutorial/jinja2/development.ini @@ -3,7 +3,6 @@ use = egg:tutorial pyramid.reload_templates = true pyramid.includes = pyramid_debugtoolbar - pyramid_jinja2 [server:main] use = egg:pyramid#wsgiref diff --git a/docs/quick_tutorial/jinja2/tutorial/__init__.py b/docs/quick_tutorial/jinja2/tutorial/__init__.py index 013d4538f..1f6783c06 100644 --- a/docs/quick_tutorial/jinja2/tutorial/__init__.py +++ b/docs/quick_tutorial/jinja2/tutorial/__init__.py @@ -3,6 +3,7 @@ from pyramid.config import Configurator def main(global_config, **settings): config = Configurator(settings=settings) + config.include('pyramid_jinja2') config.add_route('home', '/') config.add_route('hello', '/howdy') config.scan('.views') |