Merge remote-tracking branch 'origin/fix_req' into fix_req

# Conflicts:
#	requirements.txt
feature/fix_generate_pass^2
Andrey 8 years ago
parent 326820d94f
commit 7b28e891c0
  1. 1
      access/urls.py

@ -23,4 +23,5 @@ urlpatterns = [
# views.ManagementPassword.as_view(), # views.ManagementPassword.as_view(),
# name='management-password' # name='management-password'
# ) # )
] ]

Loading…
Cancel
Save