Merge branch 'develop' into 'feature/authentication'
# Conflicts: # frontend/src/components/TenantCard.tsx
Showing
- frontend/src/components/CartHeader.tsx 1 addition, 1 deletionfrontend/src/components/CartHeader.tsx
- frontend/src/components/OrderCard.tsx 9 additions, 9 deletionsfrontend/src/components/OrderCard.tsx
- frontend/src/components/TenantCard.tsx 34 additions, 77 deletionsfrontend/src/components/TenantCard.tsx
- frontend/src/components/TenantHeader.tsx 9 additions, 9 deletionsfrontend/src/components/TenantHeader.tsx
Please register or sign in to comment