Skip to content
Snippets Groups Projects
Commit 66816d61 authored by AILLET Gabriel's avatar AILLET Gabriel
Browse files

Merge branch 'main' into 'master' 

# Conflicts:
#   angular.json
#   src/app/app.component.html
#   src/app/app.module.ts
#   src/index.html
parents 4e42547f 96347eaf
No related branches found
No related tags found
1 merge request!3test slider
Hide whitespace changes
Inline Side-by-side
Showing
with 131 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment