summaryrefslogtreecommitdiff
path: root/docs/api/interfaces.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-03-11 12:41:21 -0400
committerChris McDonough <chrism@plope.com>2015-03-11 12:41:21 -0400
commitb58909676c28080c320fdb4861b7a49f5728a3aa (patch)
tree87d4da217a1609f2229fcda73acdde34e8532944 /docs/api/interfaces.rst
parentc0070c95eeb39186c7c2ea0dea6b972c5782f185 (diff)
parent8ebde50fdc7322e82b96ad103ab168b92ca2b74a (diff)
downloadpyramid-b58909676c28080c320fdb4861b7a49f5728a3aa.tar.gz
pyramid-b58909676c28080c320fdb4861b7a49f5728a3aa.tar.bz2
pyramid-b58909676c28080c320fdb4861b7a49f5728a3aa.zip
fix merge conflicts after merging master to fix.view-lookup branch; do the merge to see diffs more clearly
Diffstat (limited to 'docs/api/interfaces.rst')
-rw-r--r--docs/api/interfaces.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/api/interfaces.rst b/docs/api/interfaces.rst
index a62976d8a..de2a664a4 100644
--- a/docs/api/interfaces.rst
+++ b/docs/api/interfaces.rst
@@ -56,6 +56,9 @@ Other Interfaces
.. autointerface:: IRenderer
:members:
+ .. autointerface:: IResponseFactory
+ :members:
+
.. autointerface:: IViewMapperFactory
:members: