Skip to content

Commit

Permalink
Merge branch 'master' of github.com:atlas-bi/System # Please enter a …
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
christopherpickering committed Aug 23, 2023
2 parents cbfdf9e + db43cce commit 5507c70
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 1.26.0 (2023-08-23)

* Merge branch 'master' of github.com:atlas-bi/System # ([8ddf650](https://github.com/atlas-bi/System/commit/8ddf650))
* feat(charts): changed chart size on homepage ([c968cac](https://github.com/atlas-bi/System/commit/c968cac))

## 1.25.0 (2023-08-23)

* Merge branch 'master' of github.com:atlas-bi/System ([7d1cb73](https://github.com/atlas-bi/System/commit/7d1cb73))
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -193,5 +193,5 @@
"npm run format"
]
},
"version": "1.25.0"
"version": "1.26.0"
}

0 comments on commit 5507c70

Please sign in to comment.