Merge branch '1.10' into 1.11

2014-04-01 11:13:28 -07:00 · 2014-04-01 11:13:28 -07:00 · e65b627021
parent 9044860b41 e1d92087fa
commit e65b627021
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