Merge branch 'develop' into 'feature/authentication' (a813ff4a) · Commits · MealsHub / MealsHub

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit a813ff4a authored 1 year ago by

Imanuel Raditya

Browse files

Merge branch 'develop' into 'feature/authentication'

# Conflicts:
#   frontend/src/components/ProductCard.tsx
#   frontend/src/pages/OrderSummary.tsx

parents a83d6653 25d41c77

Hide whitespace changes

Inline Side-by-side

Showing with 131 additions and 49 deletions

Please register or to comment

Admin message

Merge branch 'develop' into 'feature/authentication'