summaryrefslogtreecommitdiff
path: root/docs/whatsnew-1.6.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-12-31 23:31:17 -0800
committerSteve Piercy <web@stevepiercy.com>2018-12-31 23:31:17 -0800
commitc52a261e56fd10ccc979a687dc2249d1b06f1a9d (patch)
tree620a74035e6dfa1edd9fabc827b82f2b83ca3693 /docs/whatsnew-1.6.rst
parentf3d6b2206f523697a028d07dc0aca9381b595e40 (diff)
parentb488f6671800f99299a239fa07e06f221c127b3e (diff)
downloadpyramid-c52a261e56fd10ccc979a687dc2249d1b06f1a9d.tar.gz
pyramid-c52a261e56fd10ccc979a687dc2249d1b06f1a9d.tar.bz2
pyramid-c52a261e56fd10ccc979a687dc2249d1b06f1a9d.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'docs/whatsnew-1.6.rst')
-rw-r--r--docs/whatsnew-1.6.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/whatsnew-1.6.rst b/docs/whatsnew-1.6.rst
index 77d89b017..4c116dbfe 100644
--- a/docs/whatsnew-1.6.rst
+++ b/docs/whatsnew-1.6.rst
@@ -83,7 +83,7 @@ Feature Additions
override_with='/abs/path/')``. The ``myapp:static`` asset spec is completely
made up and does not need to exist—it is used for generating URLs via
``request.static_url('myapp:static/foo.png')``. See
- https://github.com/Pylons/pyramid/issues/1252
+ https://github.com/Pylons/pyramid/pull/1252
- Added :meth:`~pyramid.config.Configurator.set_response_factory` and the
``response_factory`` keyword argument to the constructor of