Merge branch 'master' of github.com:atlas-bi/System # Please enter a …

…commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
atlas-bi · Sep 15, 2023 · 726178d · 726178d
2 parents 64ab55e + 34efa5d
commit 726178d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.42.0 (2023-09-15)
+
+* Merge branch 'master' of github.com:atlas-bi/System ([936e549](https://github.com/atlas-bi/System/commit/936e549))
+* feat(error): added error page ([61c88e5](https://github.com/atlas-bi/System/commit/61c88e5))
+
 ## <small>1.41.4 (2023-09-11)</small>
 
 * Merge branch 'master' of github.com:atlas-bi/System ([b2d15a8](https://github.com/atlas-bi/System/commit/b2d15a8))

diff --git a/package.json b/package.json
@@ -212,5 +212,5 @@
 			"npm run format"
 		]
 	},
-	"version": "1.41.4"
+	"version": "1.42.0"
 }