saret/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-09-10 10:45:57 +03:00
Code Issues Packages Projects Releases Wiki 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
parent 4638786507 3cb911a52f
commit f84cbeaaf8
10 changed files with 163 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.armv7
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"