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

e8e0a4dc

Commit e8e0a4dc authored 2 years ago by Timo Kösters

Downloads
- Plain Diff

Merge branch 'Nyaaori/fix-trusted-server-panic' into 'next'

Cleanly handle invalid response from trusted server instead of panicking

See merge request famedly/conduit!411

parents 2a52f666 23cf39c5

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/api/client_server/search.rs 1 addition, 1 deletion

src/api/client_server/search.rs
src/database/key_value/rooms/edus/typing.rs 1 addition, 2 deletions

src/database/key_value/rooms/edus/typing.rs
src/main.rs 4 additions, 1 deletion

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

src/service/rooms/event_handler/mod.rs

with 17 additions and 5 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