Skip to content
Commit 2a7a709e authored by Marcel Meyer's avatar Marcel Meyer
Browse files

Merge branch 'main' into 'mame' 

# Conflicts:
#   src/app/components/members/member-table/add-member-form/add-member-form.component.html
#   src/app/components/members/member-table/add-member-form/add-member-form.component.ts
parents 2b99ca73 9c7c33be
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment