Merge branch 'master' into master

feathersjs-ecosystem · May 26, 2021 · 10bc7a1 · 10bc7a1
2 parents 018aa2a + 21026c9
commit 10bc7a1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,17 @@
 # Changelog
 
-[Full Changelog](https://github.com/feathersjs-ecosystem/feathers-objection/compare/v7.3.0...HEAD)
+## [v7.4.0](https://github.com/feathersjs-ecosystem/feathers-objection/tree/v7.4.0) (2021-05-26)
 
-**Merged pull requests:**
-
-- Fix patch method with complex query [\#151](https://github.com/feathersjs-ecosystem/feathers-objection/pull/151) ([Thomas-git](https://github.com/Thomas-git))
+[Full Changelog](https://github.com/feathersjs-ecosystem/feathers-objection/compare/v7.3.0...v7.4.0)
 
 ## [v7.3.0](https://github.com/feathersjs-ecosystem/feathers-objection/tree/v7.3.0) (2021-05-25)
 
 [Full Changelog](https://github.com/feathersjs-ecosystem/feathers-objection/compare/v7.2.0...v7.3.0)
 
+**Merged pull requests:**
+
+- Fix patch method with complex query [\#151](https://github.com/feathersjs-ecosystem/feathers-objection/pull/151) ([Thomas-git](https://github.com/Thomas-git))
+
 ## [v7.2.0](https://github.com/feathersjs-ecosystem/feathers-objection/tree/v7.2.0) (2021-05-23)
 
 [Full Changelog](https://github.com/feathersjs-ecosystem/feathers-objection/compare/v7.1.7...v7.2.0)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "feathers-objection",
   "description": "A service plugin for ObjectionJS an ORM based on KnexJS",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "homepage": "https://github.com/feathersjs-ecosystem/feathers-objection",
   "keywords": [
     "feathers",