Merge branch 'develop' into feature/documentation

# Conflicts: # main/templates/registration/login.html
2021-03-18 09:59:18 +03:00
parent 4f240e19f6 bee14a628c
commit 10e341fcbb
2 changed files with 58 additions and 1 deletions
--- a/main/templates/registration/login.html
+++ b/main/templates/registration/login.html
@@ -30,7 +30,7 @@
          {% endif %}
          <div class="text-center">
            <button type="submit" class="btn btn-primary">Войти</button>
-            <a href="../../password_reset/" class="btn btn-link" style="display: block;">Забыли пароль?</a>
+            <a href="{% url 'password_reset' %}" class="btn btn-link" style="display: block;">Забыли пароль?</a>
          </div>
        </form>
      </div>