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/core/partials/announcements.html
+++ b/aleksis/core/templates/core/partials/announcements.html
--- a/aleksis/core/templates/core/partials/meta.html
+++ b/aleksis/core/templates/core/partials/meta.html
--- a/aleksis/core/templates/core/person/accounts.html
+++ b/aleksis/core/templates/core/person/accounts.html
--- a/aleksis/core/templates/core/person/create.html
+++ b/aleksis/core/templates/core/person/create.html
--- a/aleksis/core/templates/core/person/edit.html
+++ b/aleksis/core/templates/core/person/edit.html
--- a/aleksis/core/templates/core/person/full.html
+++ b/aleksis/core/templates/core/person/full.html
--- a/aleksis/core/templates/core/person/list.html
+++ b/aleksis/core/templates/core/person/list.html
--- a/aleksis/core/templates/impersonate/list_users.html
+++ b/aleksis/core/templates/impersonate/list_users.html
--- a/aleksis/core/templates/material/fields/ckeditor_ckeditorwidget.html
+++ b/aleksis/core/templates/material/fields/ckeditor_ckeditorwidget.html
--- a/aleksis/core/templates/oauth2_provider/application/create.html
+++ b/aleksis/core/templates/oauth2_provider/application/create.html
--- a/aleksis/core/templates/oauth2_provider/application/detail.html
+++ b/aleksis/core/templates/oauth2_provider/application/detail.html
--- a/aleksis/core/templates/oauth2_provider/application/edit.html
+++ b/aleksis/core/templates/oauth2_provider/application/edit.html
--- a/aleksis/core/templates/oauth2_provider/application/list.html
+++ b/aleksis/core/templates/oauth2_provider/application/list.html
--- a/aleksis/core/templates/oauth2_provider/authorize.html
+++ b/aleksis/core/templates/oauth2_provider/authorize.html
--- a/aleksis/core/templates/oauth2_provider/authorized-oob.html
+++ b/aleksis/core/templates/oauth2_provider/authorized-oob.html
--- a/aleksis/core/templates/oauth2_provider/authorized-token-delete.html
+++ b/aleksis/core/templates/oauth2_provider/authorized-token-delete.html
--- a/aleksis/core/templates/oauth2_provider/authorized-tokens.html
+++ b/aleksis/core/templates/oauth2_provider/authorized-tokens.html
--- a/aleksis/core/templates/search/search.html
+++ b/aleksis/core/templates/search/search.html
--- a/aleksis/core/templates/socialaccount/authentication_error.html
+++ b/aleksis/core/templates/socialaccount/authentication_error.html
--- a/aleksis/core/templates/socialaccount/connections.html
+++ b/aleksis/core/templates/socialaccount/connections.html