Merge branch 'main' into feature/readonly-sharing

# Conflicts: # server/src/services/album.service.ts
2024-04-12 17:20:36 +02:00
parent 222bcf853d 97c099e26d
commit 3211894e18
250 changed files with 9537 additions and 4911 deletions
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -8024,9 +8024,6 @@
          "isVisible": {
            "type": "boolean"
          },
-          "isWatched": {
-            "type": "boolean"
-          },
          "name": {
            "type": "string"
          },
@@ -11258,7 +11255,8 @@
        "enum": [
          "h264",
          "hevc",
-          "vp9"
+          "vp9",
+          "av1"
        ],
        "type": "string"
      }