Merge branch 'main' into renovate/ubuntu-24.x

canonical · Nov 25, 2024 · 5899d72 · 5899d72
2 parents 30b6d59 + 2c59a0b
commit 5899d72
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.trivyignore b/.trivyignore
@@ -47,3 +47,6 @@ CVE-2024-29415
 CVE-2024-34156
 CVE-2024-21538
 CVE-2024-24788
+# This should be removed once the following PR is merged.
+# https://github.com/element-hq/synapse/pull/17955
+CVE-2024-52804
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-boto3 ==1.35.67
+boto3 ==1.35.68
 cosl ==0.0.45
 deepdiff ==8.0.1
 jinja2 ==3.1.4