diff options
| author | Chris McDonough <chrism@plope.com> | 2011-07-05 22:42:21 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-07-05 22:42:21 -0400 |
| commit | 46a64705301a9340703eaf9deb93bb195241f4eb (patch) | |
| tree | 6ea05d03154a2c8556ba518523b41095eacf3a4f | |
| parent | b954816ab2ca43ccd4bc2eb53130b81ad0512996 (diff) | |
| parent | 0b4d496bba4cb66f5c94232d98a90255b39d854d (diff) | |
| download | pyramid-46a64705301a9340703eaf9deb93bb195241f4eb.tar.gz pyramid-46a64705301a9340703eaf9deb93bb195241f4eb.tar.bz2 pyramid-46a64705301a9340703eaf9deb93bb195241f4eb.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | pyramid/config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/config.py b/pyramid/config.py index be0e425c8..3ad872e27 100644 --- a/pyramid/config.py +++ b/pyramid/config.py @@ -1085,7 +1085,7 @@ class Configurator(object): The ``renderer`` attribute is optional. If it is not defined, the "null" renderer is assumed (no rendering is performed and the value is passed back to the upstream - :app:`Pyramid` machinery unmolested). + :app:`Pyramid` machinery unmodified). http_cache |