Merge branch 'main' into aco_trace

MarkDuckworth · web-flow · commit afa6d27737e5 · 2025-12-09T23:49:37.000Z
diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -6,3 +6,8 @@ branches:
     handleGHRelease: true
     releaseType: java-yoshi
     branch: java7
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-yoshi
+    branch: protobuf-4.x-rc
+    manifest: true
