Merge branch 'master' into...

Merge branch 'master' into 285-manage-permissions-for-persons-users-and-groups-django-groups-in-frontend

Merge branch 'master' into...
36388114 · Jonathan Weth · 17189375 · 5261b30c · 36388114 · 36388114
Verified Commit 36388114 authored 3 years ago by Jonathan Weth
--- a/aleksis/core/templates/socialaccount/login_cancelled.html
+++ b/aleksis/core/templates/socialaccount/login_cancelled.html
--- a/aleksis/core/templates/socialaccount/signup.html
+++ b/aleksis/core/templates/socialaccount/signup.html
--- a/aleksis/core/templates/socialaccount/snippets/provider_list.html
+++ b/aleksis/core/templates/socialaccount/snippets/provider_list.html
--- a/aleksis/core/templates/templated_email/person_changed.email
+++ b/aleksis/core/templates/templated_email/person_changed.email
--- a/aleksis/core/templates/two_factor/core/backup_tokens.html
+++ b/aleksis/core/templates/two_factor/core/backup_tokens.html
--- a/aleksis/core/templates/two_factor/core/login.html
+++ b/aleksis/core/templates/two_factor/core/login.html
--- a/aleksis/core/templates/two_factor/core/phone_register.html
+++ b/aleksis/core/templates/two_factor/core/phone_register.html
--- a/aleksis/core/templates/two_factor/core/setup.html
+++ b/aleksis/core/templates/two_factor/core/setup.html
--- a/aleksis/core/templates/two_factor/core/setup_complete.html
+++ b/aleksis/core/templates/two_factor/core/setup_complete.html
--- a/aleksis/core/templates/two_factor/profile/disable.html
+++ b/aleksis/core/templates/two_factor/profile/disable.html
--- a/aleksis/core/templates/two_factor/profile/profile.html
+++ b/aleksis/core/templates/two_factor/profile/profile.html
--- a/aleksis/core/templatetags/dashboard.py
+++ b/aleksis/core/templatetags/dashboard.py
--- a/aleksis/core/templatetags/html_helpers.py
+++ b/aleksis/core/templatetags/html_helpers.py
--- a/aleksis/core/tests/browser/test_selenium.py
+++ b/aleksis/core/tests/browser/test_selenium.py
--- a/aleksis/core/tests/models/test_group_sync.py
+++ b/aleksis/core/tests/models/test_group_sync.py
--- a/aleksis/core/tests/models/test_pdffile.py
+++ b/aleksis/core/tests/models/test_pdffile.py
--- a/aleksis/core/tests/models/test_person.py
+++ b/aleksis/core/tests/models/test_person.py
--- a/aleksis/core/urls.py
+++ b/aleksis/core/urls.py
--- a/aleksis/core/util/apps.py
+++ b/aleksis/core/util/apps.py
--- a/aleksis/core/util/auth_helpers.py
+++ b/aleksis/core/util/auth_helpers.py