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

e0072eff

Commit e0072eff authored 3 years ago by Timo Kösters

Downloads
- Plain Diff

Merge branch 'v5' into 'master'

feat: support room version 5

See merge request famedly/conduit!138

parents cae2b200 918df9ca

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/client_server/capabilities.rs 1 addition, 0 deletions

src/client_server/capabilities.rs
src/client_server/membership.rs 8 additions, 3 deletions

src/client_server/membership.rs
src/client_server/room.rs 4 additions, 1 deletion

src/client_server/room.rs
src/database/rooms.rs 5 additions, 1 deletion

src/database/rooms.rs
src/pdu.rs 1 addition, 0 deletions

src/pdu.rs
src/server_server.rs 16 additions, 17 deletions

src/server_server.rs

with 35 additions and 22 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