Skip to content

Commit

Permalink
Merge branch 'main' into merge-main-v2-1
Browse files Browse the repository at this point in the history
  • Loading branch information
Trivo25 committed Oct 21, 2024
2 parents 212f778 + ad774e1 commit 26442a9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
_Security_ in case of vulnerabilities.
-->

## [Unreleased](https://github.com/o1-labs/o1js/compare/f15293a69...HEAD)
## [Unreleased](https://github.com/o1-labs/o1js/compare/7e9394...HEAD)

## [1.9.1](https://github.com/o1-labs/o1js/compare/f15293a69...7e9394) - 2024-10-15

## [2.0.0](https://github.com/o1-labs/o1js/compare/f15293a69...HEAD)

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "o1js",
"description": "TypeScript framework for zk-SNARKs and zkApps",
"version": "1.9.0",
"version": "1.9.1",
"license": "Apache-2.0",
"homepage": "https://github.com/o1-labs/o1js/",
"repository": {
Expand Down

0 comments on commit 26442a9

Please sign in to comment.