diff options
| author | Chris McDonough <chrism@plope.com> | 2013-10-17 15:21:56 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-10-17 15:21:56 -0400 |
| commit | 4065081434a455a61377c770705375e085be8f16 (patch) | |
| tree | 613b7a619d3e8846765ab51ee7d35ba518919690 /docs/quick_tutorial/jinja2 | |
| parent | 61d1f729f4d9cc17a5fbcff0612512bc9f5fe7a2 (diff) | |
| parent | 3acee31f86bcde8abbb4e63715afc5ca67976eaf (diff) | |
| download | pyramid-4065081434a455a61377c770705375e085be8f16.tar.gz pyramid-4065081434a455a61377c770705375e085be8f16.tar.bz2 pyramid-4065081434a455a61377c770705375e085be8f16.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
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') |