Merge branch '1.12' into 1.13

2014-04-01 11:13:28 -07:00 · 2014-04-01 11:13:28 -07:00 · 6c4bea5673
parent 196b3cc110 cb6c4bec5d
commit 6c4bea5673
2 changed files with 0 additions and 2 deletions
--- a/sites/_shared_static/logo.png
+++ b/sites/_shared_static/logo.png
--- a/sites/shared_conf.py
+++ b/sites/shared_conf.py
@ -1,6 +1,4 @@
 from datetime import datetime
-import os
-import sys

 import alabaster