Merge branch 'master' into guardian

# 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
487 changed files with 75905 additions and 552 deletions

View File

@ -20,6 +20,7 @@ class ApplicationListView(LoginRequiredMixin, PermissionListMixin, ListView):
model = Application
permission_required = 'passbook_core.view_application'
ordering = 'name'
paginate_by = 40
template_name = 'administration/application/list.html'
def get_queryset(self):