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

0a0f2276

Commit 0a0f2276 authored 1 year ago by Timo Kösters

Downloads
- Plain Diff

Merge branch 'registrationtokens' into 'next'

Registrationtokens

Closes #372

See merge request famedly/conduit!533

parents 2581f7a1 18355815

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

README.md 1 addition, 4 deletions

README.md
src/api/client_server/account.rs 16 additions, 7 deletions

src/api/client_server/account.rs
src/api/client_server/sync.rs 4 additions, 4 deletions

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

src/config/mod.rs
src/database/mod.rs 4 additions, 0 deletions

src/database/mod.rs
src/service/rooms/spaces/mod.rs 17 additions, 3 deletions

src/service/rooms/spaces/mod.rs
src/service/uiaa/mod.rs 11 additions, 0 deletions

src/service/uiaa/mod.rs

with 54 additions and 18 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