Merge remote-tracking branch 'upstream/main' into copy-object-prototype

timostamm · Mar 13, 2024 · 56606a9 · 56606a9
2 parents a9ac176 + 14e1dfd
commit 56606a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,7 +20,7 @@ jobs:
         if: success()
         uses: actions/setup-go@v3
         with:
-          go-version: 1.16.4
+          go-version: 1.17.13
 
       - name: Setup Node
         if: success()

diff --git a/MANUAL.md b/MANUAL.md
@@ -1316,7 +1316,7 @@ MyMessage.fromJsonString(jsonString);
 
 Both methods take an optional second argument "options" of type `JsonReadOptions`:
 
-- `ignoreUnknownFields `boolean`
+- `ignoreUnknownFields: boolean`
   
   Ignore unknown fields: Proto3 JSON parser should reject unknown fields
   by default. This option ignores unknown fields in parsing.