Merge branch 'master' into 3.4.0

tbrent · tbrent · commit e5b5ab4d4b79 · 2024-05-30T14:03:26.000-04:00
diff --git a/audits/Solidified - Audit Report - Reserve Protocol - April 25 2024.pdf b/audits/Solidified - Audit Report - Reserve Protocol - April 25 2024.pdf
diff --git a/docs/writing-collateral-plugins.md b/docs/writing-collateral-plugins.md
@@ -55,8 +55,8 @@ npx hardhat test test/plugins/individual-collateral/<protocol>/<MyNewCollaterPlu
 
 ## Submission
 
-Make a pr against the `master` branch in the Reserve [protocol repo](https://github.com/reserve-protocol/protocol) and tag `larrythecucumber321` as a reviewer.
+Make a pr against the `master` branch in the Reserve [protocol repo](https://github.com/reserve-protocol/protocol).
 
 ## Support
 
-If you need support along the way, join us in the [Reserve discord](https://discord.gg/FYsAUB3m) and tag `@Larry the Cucumber#7595` or any dev that is online.
+If you need support along the way, join us in the [Reserve discord](https://discord.gg/FYsAUB3m) #technical-discussions channel.
diff --git a/funding.json b/funding.json
@@ -0,0 +1,5 @@
+{
+  "opRetro": {
+    "projectId": "0xab1ddf597f6539acc5ad601c2a6d2899c0475cfd9cc3b837939b1084ba5d7a36"
+  }
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "opRetro": {
 +    "projectId": "0xab1ddf597f6539acc5ad601c2a6d2899c0475cfd9cc3b837939b1084ba5d7a36"
 +  }
 +}