diff options
| author | Chris McDonough <chrism@plope.com> | 2011-08-08 23:27:16 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-08-08 23:27:16 -0400 |
| commit | 7a83ba1c6d997829f13b20676cbaaf0a6ee488ab (patch) | |
| tree | 72029a6b5b9bf2d9c31174bd440b0009584e8c00 | |
| parent | 6c3f78b0a5563a642b98f7a0eb01d1854c45e6b0 (diff) | |
| parent | a956e9dcc65ceda76b1c32e3343eaf3924352763 (diff) | |
| download | pyramid-7a83ba1c6d997829f13b20676cbaaf0a6ee488ab.tar.gz pyramid-7a83ba1c6d997829f13b20676cbaaf0a6ee488ab.tar.bz2 pyramid-7a83ba1c6d997829f13b20676cbaaf0a6ee488ab.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 a12df8ef7..3fac6847d 100644 --- a/pyramid/config.py +++ b/pyramid/config.py @@ -138,7 +138,7 @@ class Configurator(object): The Configurator accepts a number of arguments: ``registry``, ``package``, ``settings``, ``root_factory``, ``authentication_policy``, - ``authorization_policy``, ``renderers`` ``debug_logger``, + ``authorization_policy``, ``renderers``, ``debug_logger``, ``locale_negotiator``, ``request_factory``, ``renderer_globals_factory``, ``default_permission``, ``session_factory``, ``default_view_mapper``, ``autocommit``, and ``exceptionresponse_view``. |