merge heads

2012-02-10 11:19:55 -05:00
parent 6779e9b45e 2359de96eb
commit 3bab1336f2
1 changed files with 1 additions and 1 deletions
--- a/registration/password_reset_email.html
+++ b/registration/password_reset_email.html
@@ -3,7 +3,7 @@

 {% trans "Please go to the following page and choose a new password:" %}
 {% block reset_link %}
-https://6002x.mitx.mit.edu{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %}
+{{ protocol }}://{{ site_name }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %}
 {% endblock %}
 {% trans "Your username, in case you've forgotten:" %} {{ user.username }}