Merge branch 'master' into bug/3806/cannot_create_vms_after_password_reset

This commit is contained in:
PCoder 2017-09-25 23:55:20 +05:30
commit 78abc0c740
2 changed files with 5 additions and 5 deletions

View file

@ -16,7 +16,7 @@ from django.http import Http404, HttpResponseRedirect, HttpResponse
from django.shortcuts import redirect, render
from django.utils.http import urlsafe_base64_decode
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import get_language, ugettext_lazy as _
from django.utils.translation import ugettext
from django.views.generic import (
View, CreateView, FormView, ListView, DetailView, DeleteView,