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

Merge branch 'main' of https://space.it-frankfurt.com/gitlab/bast/climbing-hall-frontend

# Conflicts:
#	src/app/app-routing.module.ts
#	src/app/app.module.ts
#	src/app/components/members/member-table/member-details/member-details.component.html
#	src/app/components/members/member-table/member-details/member-details.component.ts
#	src/app/components/members/member-table/member-table.component.html
#	src/app/components/members/member-table/member-table.component.scss
#	src/app/components/members/member-table/member-table.component.ts
parents 35392692 73978e9e
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment