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

a01fee0b

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

Downloads
- Plain Diff

Merge branch 'ws'

# Conflicts:
#	Cargo.toml
#	src/api/core/ciphers.rs
#	src/main.rs

parents 924e4a17 67adfee5

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

Cargo.lock 391 additions, 146 deletions

Cargo.lock
Cargo.toml 17 additions, 3 deletions

Cargo.toml
Dockerfile 1 addition, 0 deletions

Dockerfile
Dockerfile.alpine 1 addition, 0 deletions

Dockerfile.alpine
README.md 32 additions, 0 deletions

README.md
src/api/core/ciphers.rs 72 additions, 56 deletions

src/api/core/ciphers.rs
src/api/core/folders.rs 15 additions, 9 deletions

src/api/core/folders.rs
src/api/mod.rs 1 addition, 0 deletions

src/api/mod.rs
src/api/notifications.rs 339 additions, 6 deletions

src/api/notifications.rs
src/db/models/cipher.rs 11 additions, 5 deletions

src/db/models/cipher.rs
src/db/models/folder.rs 2 additions, 2 deletions

src/db/models/folder.rs
src/main.rs 7 additions, 3 deletions

src/main.rs

with 889 additions and 230 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