From 76fb48ee56d37f68849009e78964a235ea7e1e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ju=CC=88rg=20Lehni?= <juerg@scratchdisk.com>
Date: Wed, 25 Sep 2024 13:32:23 +0200
Subject: [PATCH] v3.1.5

---
 doc/release-notes/changelog.md | 11 ++++++++++-
 package-lock.json              |  4 ++--
 package.json                   |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/doc/release-notes/changelog.md b/doc/release-notes/changelog.md
index ee933127d..e13d95845 100644
--- 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
index ccf88f486..f460c67d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "objection",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "objection",
-      "version": "3.1.4",
+      "version": "3.1.5",
       "license": "MIT",
       "dependencies": {
         "ajv": "^8.17.1",
diff --git a/package.json b/package.json
index 54f65253d..e659aafae 100644
--- 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",