diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-04-01 11:13:28 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-04-01 11:13:28 -0700 |
| commit | cb6c4bec5d1f71347992ec7509c054fb5508c123 (patch) | |
| tree | 0b75157e92c13164e4881010a07a2c00e62cf64c | |
| parent | 619b24738a4aef12917c906b7773638b730ffaa5 (diff) | |
| parent | e65b6270213f8e961372c52352d64eeb691d1487 (diff) | |
| download | paramiko-cb6c4bec5d1f71347992ec7509c054fb5508c123.tar.gz | |
Merge branch '1.11' into 1.12
| -rw-r--r-- | sites/_shared_static/logo.png | bin | 6401 -> 0 bytes | |||
| -rw-r--r-- | sites/shared_conf.py | 2 |
2 files changed, 0 insertions, 2 deletions
diff --git a/sites/_shared_static/logo.png b/sites/_shared_static/logo.png Binary files differdeleted file mode 100644 index bc76697e..00000000 --- a/sites/_shared_static/logo.png +++ /dev/null diff --git a/sites/shared_conf.py b/sites/shared_conf.py index 86ecdfe8..eb899834 100644 --- a/sites/shared_conf.py +++ b/sites/shared_conf.py @@ -1,6 +1,4 @@ from datetime import datetime -import os -import sys import alabaster |
