Merge branch 'main' into 'routing' (5a98ee18) · Commits · IF3110-2023-02-H / EatsNow App

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 5a98ee18 authored 1 year ago by

Kenny Benaya Nathan

Browse files

Merge branch 'main' into 'routing'

# Conflicts:
#   app/models/restaurant.php
#   app/views/home/index.php
#   app/views/restaurantPage/index.php
#   app/views/restaurants/index.php
#   app/views/restaurants/restaurantCard.php

parents d5d14819 50dcfeee

Hide whitespace changes

Inline Side-by-side

Showing with 881 additions and 110 deletions

Please register or to comment

Admin message

Merge branch 'main' into 'routing'