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

b42d3485

Commit b42d3485 authored 3 years ago by Timo Kösters

Downloads
- Plain Diff

Merge branch 'up-ruma' into 'master'

Upgrade ruma and clean up request sending code

See merge request famedly/conduit!72

parents 27d25914 e1c4e5c7

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Cargo.lock 19 additions, 18 deletions

Cargo.lock
Cargo.toml 2 additions, 2 deletions

Cargo.toml
src/appservice_server.rs 15 additions, 21 deletions

src/appservice_server.rs
src/client_server/config.rs 22 additions, 9 deletions

src/client_server/config.rs
src/client_server/profile.rs 8 additions, 8 deletions

src/client_server/profile.rs
src/database/pusher.rs 18 additions, 19 deletions

src/database/pusher.rs
src/server_server.rs 18 additions, 18 deletions

src/server_server.rs

with 102 additions and 95 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