From 2aaa1b62fdf0e2dec4637f7e9d5d46ec46f7fa77 Mon Sep 17 00:00:00 2001
From: Natalie Tay <natalie.tay@gmail.com>
Date: Thu, 2 Nov 2023 19:47:33 +0800
Subject: [PATCH 1/2] Update README.md

test
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 8f6bafc6f261e..fa5775e969e7b 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+x
+
 <a href="https://www.discourse.org/">
   <img src="images/discourse-readme-logo.png" width="300px">
 </a>

From c3b2aad93f23f0801b2e5e1e5fb3a2ffcf8790f1 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Thu, 19 Dec 2024 02:41:51 +0000
Subject: [PATCH 2/2] fix: app/assets/javascripts/discourse-common/package.json
 to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-NANOID-8492085
---
 app/assets/javascripts/discourse-common/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json
index bcbb1fce2adf7..ad2795d98e3a3 100644
--- a/app/assets/javascripts/discourse-common/package.json
+++ b/app/assets/javascripts/discourse-common/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@ember/string": "^3.1.1",
-    "@uppy/aws-s3": "3.0.6",
+    "@uppy/aws-s3": "4.0.0",
     "@uppy/aws-s3-multipart": "3.1.3",
     "@uppy/core": "3.0.4",
     "@uppy/drop-target": "2.0.1",