Merge branch 'develop' into feature/statistic/backend
# Conflicts: # access_controller/urls.py # main/forms.py # main/views.py
This commit is contained in:
@@ -16,6 +16,7 @@ Including another URLconf
|
||||
from django.contrib import admin
|
||||
from django.contrib.auth import views as auth_views
|
||||
from django.urls import path, include
|
||||
from main.views import work_page, work_hand_over, work_become_engineer, AdminPageView
|
||||
|
||||
from main.views import main_page, profile_page, CustomRegistrationView, CustomLoginView
|
||||
from main.views import work_page, work_hand_over, work_become_engineer, \
|
||||
|
||||
Reference in New Issue
Block a user