Skip to content
Snippets Groups Projects
Commit 3c1132a0 authored by Bilel El Yaagoubi's avatar Bilel El Yaagoubi
Browse files

Merge branch 'master' into 'show_liked_movies'

# Conflicts:
#   frontend/src/router/index.js
#   frontend/src/views/Home.vue
parents 09206b50 a5ef887c
Branches
No related tags found
1 merge request!23Show liked movies
Pipeline #42645 passed with warnings