diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-04 11:44:57 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-04 11:44:57 -0800 |
commit | fac6cde8743d73bfce200062da1bbf5e05a74742 (patch) | |
tree | 7fcc75d1f8ed456660c2d954b268f27e0354974f /sites/docs/api/server.rst | |
parent | 0965eaa65d194244b594f7098eb5192a2bbf8484 (diff) | |
parent | 72a73f55fae697fe3b940f378664a7c58214647f (diff) |
Merge branch '1.11' into 1.12
Conflicts:
paramiko/hostkeys.py
Diffstat (limited to 'sites/docs/api/server.rst')
-rw-r--r-- | sites/docs/api/server.rst | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sites/docs/api/server.rst b/sites/docs/api/server.rst new file mode 100644 index 00000000..ea854544 --- /dev/null +++ b/sites/docs/api/server.rst @@ -0,0 +1,5 @@ +Server implementation +===================== + +.. automodule:: paramiko.server + :member-order: bysource |