diff options
| author | Bryan Newbold <bnewbold@robocracy.org> | 2019-01-17 10:44:38 -0800 |
|---|---|---|
| committer | Bryan Newbold <bnewbold@robocracy.org> | 2019-01-17 10:44:38 -0800 |
| commit | 24e7a7038f9f0c827a11282a5cc646117ffdfb9b (patch) | |
| tree | 40227dbd1a2b652bad24c9d71f8027c20ef1b7d1 /rust/Cargo.lock | |
| parent | 3ad702e413c084590505cff16f9532b236718049 (diff) | |
| parent | 0a8c9a5e07213276617f06b0379a166e7fd1c100 (diff) | |
| download | fatcat-24e7a7038f9f0c827a11282a5cc646117ffdfb9b.tar.gz fatcat-24e7a7038f9f0c827a11282a5cc646117ffdfb9b.zip | |
Merge branch 'citation-efficiency'
Manually merged conflict in:
- ./TODO
Diffstat (limited to 'rust/Cargo.lock')
| -rw-r--r-- | rust/Cargo.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/rust/Cargo.lock b/rust/Cargo.lock index e89954ad..c0df5a2a 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -538,6 +538,9 @@ dependencies = [ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sentry 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)", "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)", |