Merge branch 'feature/registration' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into feature/registration

# Conflicts: # main/views.py
2021-02-10 19:16:16 +03:00
parent 938b9894fe 0bc34f8100
commit e5964f6eaf
2 changed files with 2 additions and 0 deletions
--- a/main/views.py
+++ b/main/views.py
@@ -8,6 +8,7 @@ from main.models import UserProfile
 from django.contrib.auth.models import User
 from main.forms import CustomRegistrationForm
 from django_registration.views import RegistrationView
+from zenpy import Zenpy


 class CustomRegistrationView(RegistrationView):