Skip to content

Commit

Permalink
Merge branch 'master' into increase_linter_rules
Browse files Browse the repository at this point in the history
# Conflicts:
#	Cargo.toml
#	src/routes/bestiary.rs
#	src/routes/shop.rs
#	src/services/url_calculator.rs
  • Loading branch information
RakuJa committed Dec 9, 2024
2 parents 703ee5f + e674ecc commit ba31ab9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ sqlx = { version = "0.8.2", features = ["runtime-async-std", "sqlite"] }
cached = { version = "0.54.0", features = ["async"] }

anyhow = "1.0.93"
serde = { version = "1.0.215", features = ["derive"] }
serde_json = "1.0.133"
serde = { version = "1.0.214", features = ["derive"] }
serde_json = "1.0.132"
strum = {version="0.26.3", features = ["derive"]}
fastrand = "2.2.0"
counter = "0.6.0"
Expand Down

0 comments on commit ba31ab9

Please sign in to comment.