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 | 6c4bea567374c95a1ab22072465da9985f9d744c (patch) | |
| tree | 71a80bdb94a645657e57c5a7a8b3e604ed793475 /sites | |
| parent | 196b3cc110f68a5d328d4f24714b64a0704fd228 (diff) | |
| parent | cb6c4bec5d1f71347992ec7509c054fb5508c123 (diff) | |
Merge branch '1.12' into 1.13
Diffstat (limited to 'sites')
| -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 52cec938..56dc55d2 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 |
