Merge branch 'dev' into features/notifications

# Conflicts: # package-lock.json # package.json # src/components/Header/Header.jsx
2026-01-12 00:15:16 +01:00
parent 69e7fdb35c 007ba0b758
commit 6da4880f0d
42 changed files with 2469 additions and 1656 deletions
@@ -1,4 +1,3 @@
-/* BACKGROUND ////////////////////////////////////////////////////////*/
 .backgroundContainer {
  z-index: 0;
  margin: 0;