Skip to content

Commit

Permalink
Merge branch 'main' into DEAR-122-Frontend
Browse files Browse the repository at this point in the history 
# Conflicts:
#	app/(main)/(home)/page.tsx
  • Loading branch information
@smuefsmuef
smuefsmuef committed Jul 21, 2024
2 parents 786fc8d + 223a8dc commit 967bc18
Showing 1 changed file with 18 additions and 25 deletions.
43 changes: 18 additions & 25 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 967bc18

Please sign in to comment.