habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into guardian

Browse Source 
# Conflicts:
#	Pipfile
#	Pipfile.lock
#	passbook/admin/views/invitations.py
#	passbook/admin/views/policy.py
#	passbook/admin/views/providers.py
#	passbook/admin/views/sources.py
#	passbook/admin/views/users.py
This commit is contained in:
Langhammer, Jens
2019-10-15 15:09:11 +02:00
parent 37111fd07b 4086252979
commit 261d57ad7b
487 changed files with 75905 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
passbook/admin/views/groups.py
View File

@ -20,6 +20,7 @@ class GroupListView(LoginRequiredMixin, PermissionListMixin, ListView):
model = Group
permission_required = 'passbook_core.view_group'
ordering = 'name'
paginate_by = 40
template_name = 'administration/group/list.html'