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
Loading
Please register or sign in to comment