saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-05-10 13:43:56 +00:00
Code Activity

Merge branch 'master' into rocket-0.4

Browse source 
# Conflicts:
#	src/db/models/organization.rs
This commit is contained in:
Daniel García 2018-11-14 16:14:49 +01:00
commit f84cbeaaf8
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
10 changed files with 163 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -4,7 +4,7 @@
####################### VAULT BUILD IMAGE #######################
FROM node:8-alpine as vault
ENV VAULT_VERSION "v2.4.0"
ENV VAULT_VERSION "v2.5.0"
ENV URL "https://github.com/bitwarden/web.git"