Merge branch 'master' of github.com:MITx/mitx

2012-07-26 10:43:42 -04:00
parent 7103bd0071 73d6565fac
commit 9d2bccbee7
21 changed files with 303 additions and 142 deletions
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -112,6 +112,7 @@ LIB_URL = '/static/js/'
 # BOOK_URL = '/static/book/'
 BOOK_URL = 'https://mitxstatic.s3.amazonaws.com/book_images/' # For AWS deploys
 # RSS_URL = r'lms/templates/feed.rss'
+# PRESS_URL = r''
 RSS_TIMEOUT = 600

 # Configuration option for when we want to grab server error pages