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

1b56a7bb

Commit 1b56a7bb authored 3 years ago by Timo Kösters

Downloads
- Plain Diff

Merge branch 'speed' into 'master'

fix: e2ee over federation

See merge request famedly/conduit!165

parents 5aa56b92 d485eb5a

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Cargo.lock 165 additions, 168 deletions

Cargo.lock
Cargo.toml 2 additions, 1 deletion

Cargo.toml
src/client_server/sync.rs 7 additions, 26 deletions

src/client_server/sync.rs
src/client_server/to_device.rs 1 addition, 0 deletions

src/client_server/to_device.rs
src/database.rs 10 additions, 1 deletion

src/database.rs
src/database/rooms.rs 95 additions, 3 deletions

src/database/rooms.rs
src/database/sending.rs 18 additions, 13 deletions

src/database/sending.rs
src/server_server.rs 73 additions, 31 deletions

src/server_server.rs

with 371 additions and 243 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