Merge branch 'main' into chore/further-tailwind

# Conflicts: # webclient/package.json
TUM-Dev · Dec 22, 2023 · 343504c · 343504c
2 parents dc9da36 + 3fc41d2
commit 343504c
Show file tree

Hide file tree

Showing 25 changed files with 895 additions and 37,630 deletions.
diff --git a/.github/workflows/server-cicd.yml b/.github/workflows/server-cicd.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup | Checkout
         uses: actions/checkout@v4
       - name: Setup | Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.6.0
         with:
           toolchain: stable
           components: clippy
@@ -37,7 +37,7 @@ jobs:
       - name: Setup | Checkout
         uses: actions/checkout@v4
       - name: Setup | Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.6.0
         with:
           toolchain: stable
           cache: false

diff --git a/data/external/models/nat.py b/data/external/models/nat.py
@@ -77,8 +77,6 @@ class Room(PydanticConfiguration):
     room_identifier: str | None
     campus_id: str | None
     building_code: str
-    events_end: str | None  # no idea what this is...
-    events_start: str | None  # no idea what this is...
     org_id: int | None = None
 
     @classmethod