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

f84cbeaa

Unverified Commit f84cbeaa authored 6 years ago by Daniel García

Downloads
- Plain Diff

Merge branch 'master' into rocket-0.4

# Conflicts:
#	src/db/models/organization.rs

parents 46387865 3cb911a5

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Dockerfile 1 addition, 1 deletion

Dockerfile
Dockerfile.aarch64 1 addition, 1 deletion

Dockerfile.aarch64
Dockerfile.alpine 1 addition, 1 deletion

Dockerfile.alpine
Dockerfile.armv7 1 addition, 1 deletion

Dockerfile.armv7
README.md 5 additions, 3 deletions

README.md
src/api/core/ciphers.rs 12 additions, 3 deletions

src/api/core/ciphers.rs
src/api/core/organizations.rs 21 additions, 21 deletions

src/api/core/organizations.rs
src/auth.rs 15 additions, 9 deletions

src/auth.rs
src/db/models/organization.rs 105 additions, 1 deletion

src/db/models/organization.rs
src/db/models/user.rs 1 addition, 1 deletion

src/db/models/user.rs

with 163 additions and 42 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