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 | e65b6270213f8e961372c52352d64eeb691d1487 (patch) | |
| tree | a7d211105af36cd18243a727e6f69b4d58fb6762 | |
| parent | 9044860b41df3d89449fde3852df0298d911ce28 (diff) | |
| parent | e1d92087fae4ba0404c40ef1ee383294777476b8 (diff) | |
Merge branch '1.10' into 1.11
| -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 |
