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

5edbd0e9

Unverified Commit 5edbd0e9 authored 6 years ago by Daniel García

Downloads
- Plain Diff

Merge branch 'master' into rocket-0.4

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/api/core/mod.rs

parents f84cbeaa 1d4944b8

No related branches found

No related tags found

No related merge requests found

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.env 8 additions, 0 deletions

.env
Cargo.lock 295 additions, 159 deletions

Cargo.lock
Cargo.toml 10 additions, 4 deletions

Cargo.toml
README.md 27 additions, 2 deletions

README.md
src/api/core/two_factor.rs 218 additions, 0 deletions

src/api/core/two_factor.rs
src/api/identity.rs 19 additions, 0 deletions

src/api/identity.rs
src/db/models/cipher.rs 3 additions, 1 deletion

src/db/models/cipher.rs
src/main.rs 14 additions, 0 deletions

src/main.rs

with 594 additions and 166 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