Merge branch '2.18' into 2.19

FasterXML · Oct 29, 2024 · 452236c · 452236c
2 parents 64c6b41 + fa5abd6
commit 452236c
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -14,7 +14,7 @@ Active maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
-2.18.1 (not yet released)
+2.18.1 (28-Oct-2024)
 
 #518: Should not read past end for CBOR string values
  (contributed by Knut W)
@@ -104,8 +104,6 @@ Active maintainers:
   are no longer leaked
  (contributed by @tgregg)
 
-=======
->>>>>>> 2.16
 2.16.2 (09-Mar-2024)
 
 No changes since 2.16.1