Merge branch 'develop' into feature/react_test

# Conflicts: # README.md # main/tests.py
2021-05-25 19:55:07 +03:00
parent be6a8d1196 724d246b6b
commit 3cdc944ce4
31 changed files with 1504 additions and 206 deletions
--- a/main/templates/registration/password_reset_form.html
+++ b/main/templates/registration/password_reset_form.html
@@ -12,7 +12,7 @@
  <p>Введте свой e-mail адрес для восстановления пароля.</p>
  <form action="." method="post">
    {{ form.as_p }}
-    <p><input class="btn btn-success" type="submit" value="Отпрваить e-mail"></p>
+    <p><input class="btn btn-success" type="submit" value="Отправить e-mail"></p>
    {% csrf_token %}
  </form>
 {% endblock %}