Skip to content

Commit

Permalink
Merge branch 'master' into hds/mock-refactor-with-ancestry
Browse files Browse the repository at this point in the history
  • Loading branch information
hds authored Jul 29, 2024
2 parents dc01dad + acf92ab commit 3cb2c16
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 12 deletions.
30 changes: 23 additions & 7 deletions tracing-serde/src/lib.rs
2 changes: 1 addition & 1 deletion tracing-subscriber/src/fmt/fmt_subscriber.rs
6 changes: 3 additions & 3 deletions tracing-subscriber/src/fmt/format/json.rs
2 changes: 1 addition & 1 deletion tracing-subscriber/src/fmt/format/mod.rs

0 comments on commit 3cb2c16

Please sign in to comment.