Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Vaultwarden
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

4cd5b06b

Unverified Commit 4cd5b06b authored 4 years ago by Mathijs van Veluw Committed by GitHub 4 years ago

Downloads
- Plain Diff

Merge branch 'master' into admin-interface

parents 9e5fd2d5 cd768439

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/api/core/ciphers.rs 42 additions, 14 deletions

src/api/core/ciphers.rs
src/api/core/organizations.rs 19 additions, 0 deletions

src/api/core/organizations.rs
src/db/models/cipher.rs 43 additions, 24 deletions

src/db/models/cipher.rs
src/db/models/collection.rs 31 additions, 1 deletion

src/db/models/collection.rs
src/db/models/organization.rs 32 additions, 5 deletions

src/db/models/organization.rs

with 167 additions and 44 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