Skip to content
Snippets Groups Projects
Commit f845e43b authored by Nallani, Abhishikth (UG - Comp Sci & Elec Eng)'s avatar Nallani, Abhishikth (UG - Comp Sci & Elec Eng)
Browse files

Merge branch 'movie-details' into 'top-rated'

# Conflicts:
#   movie-group-8/.env
#   movie-group-8/package-lock.json
#   movie-group-8/package.json
#   movie-group-8/src/App.vue
#   movie-group-8/src/components/TopRatedMovies.vue
#   movie-group-8/src/router/index.js
#   movie-group-8/src/views/Films.vue
#   movie-group-8/src/views/Login.vue
#   movie-group-8/src/views/Profile.vue
#   movie-group-8/src/views/Watchlist.vue
#   movie-group-8/vite.config.js
parents 1eef2ae9 b16f2665
No related branches found
No related tags found
3 merge requests!5Push to Main,!2Merging Top-Rated to Test,!1Profile view implemented, watchlist view and component implemented with a...
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment