Skip to content

Commit

Permalink
rebase onto master
Browse files Browse the repository at this point in the history
  • Loading branch information
abonander committed Apr 14, 2022
1 parent a3672d3 commit 6e4f769
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 17 deletions.
31 changes: 15 additions & 16 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 sqlx-core/Cargo.toml
Expand Up @@ -105,7 +105,7 @@ ahash = "0.7.6"
atoi = "0.4.0"
sqlx-rt = { path = "../sqlx-rt", version = "0.5.12"}
base64 = { version = "0.13.0", default-features = false, optional = true, features = ["std"] }
bigdecimal_ = { version = "0.3.2", optional = true, package = "bigdecimal" }
bigdecimal_ = { version = "0.3.0", optional = true, package = "bigdecimal" }
rust_decimal = { version = "1.19.0", optional = true }
bit-vec = { version = "0.6.3", optional = true }
bitflags = { version = "1.3.2", default-features = false }
Expand Down

0 comments on commit 6e4f769

Please sign in to comment.