Merge branch 'dev' into features/notifications

Browse Source

# Conflicts:
#	package-lock.json
#	package.json
#	src/components/Header/Header.jsx

...

This commit is contained in:

Giovanni committed 2026-01-12 00:15:16 +01:00

2 parents 69e7fdb35c 007ba0b758

commit 6da4880f0d

42 files changed

+2469 -1656

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

package-lock.json

Generated

+908 -918

File diff suppressed because it is too large. Load diff