merge

2146b7db · Piotr Mitros · 1f2251c9 · dad70c5a · 2146b7db
Commit 2146b7db authored Jan 13, 2012 by Piotr Mitros
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

settings.py
+2 -2

No files found.
--- a/settings.py
+++ b/settings.py
@@ -7,8 +7,8 @@ if not COURSEWARE_ENABLED:
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 SITE_NAME = "localhost:8000"

-DEFAULT_FROM_EMAIL = 'nobody@localhost'
-DEFAULT_FEEDBACK_EMAIL = 'nobody@localhost'
+DEFAULT_FROM_EMAIL = 'registration@mitx.mit.edu'
+DEFAULT_FEEDBACK_EMAIL = 'feedback@mitx.mit.edu'

 WIKI_REQUIRE_LOGIN_EDIT = True
 WIKI_REQUIRE_LOGIN_VIEW = True