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

0b89ffe5

Commit 0b89ffe5 authored 3 years ago by Timo Kösters

Downloads
- Plain Diff

Merge branch 'make-join' into 'master'

feat: make_join, send_join and /directory

See merge request famedly/conduit!59

parents 6d109b99 eedac4fd

No related branches found

No related tags found

No related merge requests found

Changes 4

Expand all Hide whitespace changes

Inline Side-by-side

Showing

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

src/client_server/membership.rs
src/database/rooms.rs 100 additions, 48 deletions

src/database/rooms.rs
src/main.rs 3 additions, 0 deletions

src/main.rs
src/server_server.rs 489 additions, 89 deletions

src/server_server.rs

with 600 additions and 145 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