From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Tue, 17 Mar 2015 17:08:27 +0000 (+0100)
Subject: merge
X-Git-Tag: myslice-1.3~56^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c97330dc9973c5676824805d574b42690fd31f0c;hp=8203b2f617faf5f0f36184952677fa1077172093;p=myslice.git

merge
---

diff --git a/portal/templates/password_reset_email.html b/portal/templates/password_reset_email.html
index 51431c73..222bbfca 100644
--- a/portal/templates/password_reset_email.html
+++ b/portal/templates/password_reset_email.html
@@ -3,7 +3,7 @@
 
 {% trans "Please go to the following page and choose a new password:" %}
 {% block reset_link %}
-{{ protocol }}://{{ domain }}{% url 'portal.django_passresetview.password_reset_confirm' uidb36=uid token=token %}
+{{ domain }}{% url 'portal.django_passresetview.password_reset_confirm' uidb36=uid token=token %}
 {% endblock %}
 {% trans "Your username, in case you've forgotten:" %} {{ user.get_username }}