v3.1.5

Vincit · Sep 25, 2024 · 76fb48e · 76fb48e
1 parent bf76780
commit 76fb48e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/doc/release-notes/changelog.md b/doc/release-notes/changelog.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 3.1.5
+
+### What's new
+
+- Types: Fix generic static `this` [#2533](https://github.com/Vincit/objection.js/pull/2533)
+- Types: Add `fromRaw` to `FromSelector regex [#2628](https://github.com/Vincit/objection.js/issues/2628)
+- Types: Fix argument types of `onConflict()` [#2635](https://github.com/Vincit/objection.js/pull/2635)
+- Types: Make `trx` optional for `Model.transaction(trx, cb)` [#2694](https://github.com/Vincit/objection.js/pull/2694)
+
 ## 3.1.4
 
 ### What's new
@@ -8,7 +17,7 @@
 - Don't call `onError()` with internal exceptions [#2603](https://github.com/Vincit/objection.js/issues/2603)
 - Remove docs and typings for nonexistent `$pick()`
 - Make `$omitFromJson()` + `$omitFromDatabaseJson()` compatible with old `$omit()` syntax
- 
+
 ## 3.1.3
 
 ### What's new

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "objection",
- "version": "3.1.4",
+ "version": "3.1.5",
  "description": "An SQL-friendly ORM for Node.js",
  "main": "lib/objection.js",
  "license": "MIT",