Merge conflict

This commit is contained in:
zandercymatics 2024-11-20 09:02:19 -07:00
parent 20c0813f78
commit 908e06c8eb
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
7 changed files with 20 additions and 21 deletions

View file

@ -175,7 +175,7 @@ class MemberExport(BaseExport):
"additional_permissions_display",
"member_display",
"domain_info",
"source",
"type",
"invitation_date",
"invited_by",
]