diff options
author | Patrick Cloke <patrickc@matrix.org> | 2023-10-17 11:56:14 -0400 |
---|---|---|
committer | Patrick Cloke <patrickc@matrix.org> | 2023-10-17 11:56:14 -0400 |
commit | 07b3b9a95e979c0125d069b8841fd7ce4917e559 (patch) | |
tree | f4c9e521e2cd0ab54b03282032a44e6d007b1cb0 /rust | |
parent | Revert "TEMPORARY Measure and log test cases" (diff) | |
parent | 1.95.0rc1 (diff) | |
download | synapse-07b3b9a95e979c0125d069b8841fd7ce4917e559.tar.xz |
Merge branch 'release-v1.95' into matrix-org-hotfixes
Diffstat (limited to 'rust')
-rw-r--r-- | rust/Cargo.toml | 6 | ||||
-rw-r--r-- | rust/src/push/evaluator.rs | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/rust/Cargo.toml b/rust/Cargo.toml |