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

81715bd8

Commit 81715bd8 authored 3 years ago by Timo Kösters

Downloads
- Plain Diff

Merge branch 'account' into 'master'

Fix account and media bugs

See merge request famedly/conduit!97

parents b3cec1d2 e1e529d8

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/account.rs 6 additions, 6 deletions

src/client_server/account.rs
src/client_server/media.rs 7 additions, 3 deletions

src/client_server/media.rs
src/database.rs 20 additions, 1 deletion

src/database.rs
src/database/media.rs 44 additions, 25 deletions

src/database/media.rs
src/database/rooms.rs 2 additions, 1 deletion

src/database/rooms.rs
src/database/users.rs 14 additions, 9 deletions

src/database/users.rs

with 93 additions and 45 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