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 · Jul 24, 2023 · 6244b26 · 6244b26
2 parents 6650e8c + b6747ad
commit 6244b26
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.15.0 (2023-07-24)
+
+* Merge branch 'master' of github.com:atlas-bi/System ([523abf1](https://github.com/atlas-bi/System/commit/523abf1))
+* feat(edit): added ability to edit/delete monitors ([faefcc0](https://github.com/atlas-bi/System/commit/faefcc0))
+
 ## <small>1.14.1 (2023-07-21)</small>
 
 * Merge branch 'master' of github.com:atlas-bi/System ([71ac382](https://github.com/atlas-bi/System/commit/71ac382))

diff --git a/package.json b/package.json
@@ -187,5 +187,5 @@
 			"npm run format"
 		]
 	},
-	"version": "1.14.1"
+	"version": "1.15.0"
 }