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

cd835fc7

Commit cd835fc7 authored 2 years ago by Timo Kösters

Downloads
- Plain Diff

Merge branch 'initialSyncFix' into 'next'

Initial sync fix

See merge request famedly/conduit!388

parents 8105c5cc 2b70d960

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Cargo.lock 11 additions, 11 deletions

Cargo.lock
Cargo.toml 1 addition, 1 deletion

Cargo.toml
src/api/client_server/media.rs 8 additions, 1 deletion

src/api/client_server/media.rs
src/api/client_server/message.rs 4 additions, 4 deletions

src/api/client_server/message.rs
src/api/client_server/read_marker.rs 3 additions, 1 deletion

src/api/client_server/read_marker.rs
src/api/client_server/sync.rs 1 addition, 0 deletions

src/api/client_server/sync.rs
src/main.rs 13 additions, 1 deletion

src/main.rs
src/service/rooms/event_handler/mod.rs 5 additions, 1 deletion

src/service/rooms/event_handler/mod.rs
src/utils/error.rs 1 addition, 1 deletion

src/utils/error.rs

with 47 additions and 21 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