Skip to content

Commit

Permalink
Merge branch 'main' into api_amount
Browse files Browse the repository at this point in the history
  • Loading branch information
modship authored Jun 3, 2024
2 parents 27f952e + 5bc7fb0 commit a5e85c6
Show file tree
Hide file tree
Showing 89 changed files with 1,931,730 additions and 423 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@
**/target
massa-client/config/*
massa-client/wallet.dat
massa-execution-worker/test_db/*
massa-execution-worker/**.bin
massa-node/config/*
massa-node/logs.txt
massa-node/storage/*
massa-node/dump/*
massa-node/storage/peers.json
massa-node/src/tests/storage
shell.nix
Expand Down
83 changes: 42 additions & 41 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion massa-api-exports/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "massa_api_exports"
version = "28.3.0"
version = "2.2.0"
authors = ["Massa Labs <[email protected]>"]
edition = "2021"

Expand Down
Loading

0 comments on commit a5e85c6

Please sign in to comment.