watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-11 08:07:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/dev' into dev
Some checks failed
Node.js CI / build (postgresql, 18.18) (push) Has been cancelled
Details

Browse source 
# Conflicts:
#	src/app/(main)/teams/[teamId]/TeamSettings.tsx
This commit is contained in:
Mike Cao 2025-09-19 18:01:42 -07:00
commit d8075764e2
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/teams/[teamId]/TeamMembersTable.tsx
View file

@ -38,7 +38,7 @@ export function TeamMembersTable({
}
return (
<Row alignItems="center">
<Row alignItems="center" maxHeight="20px">
<TeamMemberEditButton teamId={teamId} userId={row?.user?.id} role={row?.role} />
<TeamMemberRemoveButton
teamId={teamId}