diff options
| author | Andrei Vasiliu <whyte.vuhuni@gmail.com> | 2022-02-03 13:07:15 +0200 |
|---|---|---|
| committer | Andrei Vasiliu <whyte.vuhuni@gmail.com> | 2022-02-03 13:12:55 +0200 |
| commit | 4bbff69a24ac751087e5f9bd3ab9afdad7344f68 (patch) | |
| tree | b2ebf00b84c61163f17a2067578e4f922b9cd608 /Cargo.toml | |
| parent | 87225e70c3441c9ddd96d9fe0c4dd4e5a2c1289e (diff) | |
| parent | b4755ba15bac5bd01f51faef48927b9f77ff2efd (diff) | |
| download | conduit-4bbff69a24ac751087e5f9bd3ab9afdad7344f68.zip | |
Merge remote-tracking branch 'origin/next' into command-refactor
Fixed conflict with commit 78502aa6b10d97f3af3fe006fcdbd19b585d3b58
Diffstat (limited to 'Cargo.toml')
| -rw-r--r-- | Cargo.toml | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -20,7 +20,7 @@ rocket = { version = "0.5.0-rc.1", features = ["tls"] } # Used to handle request # Used for matrix spec type definitions and helpers #ruma = { version = "0.4.0", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] } -ruma = { git = "https://github.com/ruma/ruma", rev = "08d60b3d376b63462f769d4b9bd3bbfb560d501a", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] } +ruma = { git = "https://github.com/ruma/ruma", rev = "82becb86c837570224964425929d1b5305784435", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] } #ruma = { git = "https://github.com/timokoesters/ruma", rev = "50c1db7e0a3a21fc794b0cce3b64285a4c750c71", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] } #ruma = { path = "../ruma/crates/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] } |