Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

conduwuit
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

2d96323d

Commit 2d96323d authored 4 years ago by Timo Kösters

Downloads
- Plain Diff

Merge pull request 'Update ruma' (#184) from jplatte/conduit:up-ruma into master

Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/184


Reviewed-by: Timo Kösters <timo@koesters.xyz>

parents 4b3d6e73 75ea0b31

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

Cargo.lock 83 additions, 52 deletions

Cargo.lock
Cargo.toml 1 addition, 1 deletion

Cargo.toml
src/client_server/alias.rs 3 additions, 3 deletions

src/client_server/alias.rs
src/client_server/directory.rs 4 additions, 4 deletions

src/client_server/directory.rs
src/client_server/keys.rs 15 additions, 13 deletions

src/client_server/keys.rs
src/client_server/membership.rs 3 additions, 3 deletions

src/client_server/membership.rs
src/client_server/message.rs 5 additions, 5 deletions

src/client_server/message.rs
src/client_server/state.rs 14 additions, 14 deletions

src/client_server/state.rs
src/client_server/to_device.rs 1 addition, 1 deletion

src/client_server/to_device.rs
src/client_server/user_directory.rs 2 additions, 6 deletions

src/client_server/user_directory.rs
src/client_server/voip.rs 2 additions, 2 deletions

src/client_server/voip.rs
src/database/users.rs 13 additions, 12 deletions

src/database/users.rs
src/main.rs 3 additions, 3 deletions

src/main.rs
src/ruma_wrapper.rs 2 additions, 2 deletions

src/ruma_wrapper.rs

with 151 additions and 121 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment