Commit 4d8142f4 authored by Michal Čihař's avatar Michal Čihař

Merge remote-tracking branch 'origin/master'

parents 62b2c010 b89c5599
...@@ -5,8 +5,7 @@ from django.contrib.auth import views as auth_views ...@@ -5,8 +5,7 @@ from django.contrib.auth import views as auth_views
from django.views.generic.simple import direct_to_template from django.views.generic.simple import direct_to_template
from django.conf import settings from django.conf import settings
from registration.views import activate from registration.views import activate, register
from registration.views import register
from weblate.accounts.forms import RegistrationForm from weblate.accounts.forms import RegistrationForm
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment