Skip to content

Commit

Permalink
Merge branch 'main' into fix/content_type
Browse files Browse the repository at this point in the history
  • Loading branch information
kukkok3 committed May 9, 2024
2 parents a8c1bfa + 8869c69 commit 1615347
Show file tree
Hide file tree
Showing 8 changed files with 160 additions and 1,268 deletions.
2 changes: 1 addition & 1 deletion .config/dictionaries/project.dic
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,4 @@ xcodeproj
xctest
xctestrun
xcworkspace
yoroi
yoroi
154 changes: 138 additions & 16 deletions catalyst-gateway/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 catalyst-gateway/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ handlebars = "5.1.2"
anyhow = "1.0.71"
cddl = "0.9.2"
ciborium = "0.2"
pallas = { git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "954e99db9e9c3e4c4b1677614054fbe18f692504", version = "0.25.0" }
pallas = { git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "709acb19c52c6b789279ecc4bc8793b5d8b5abe9", version = "0.25.0" }
cardano-chain-follower = { git = "https://github.com/input-output-hk/hermes.git", version="0.0.1" }

[workspace.lints.rust]
Expand Down

0 comments on commit 1615347

Please sign in to comment.