diff options
| author | Daniel García <[email protected]> | 2018-11-14 16:14:49 +0100 |
|---|---|---|
| committer | Daniel García <[email protected]> | 2018-11-14 16:14:49 +0100 |
| commit | f84cbeaaf8409ded400bcd12e6ea15f33bc1d065 (patch) | |
| tree | efd51c573e35fa323a6d890c4263b536c198e89d /Dockerfile | |
| parent | 463878650772cbbe903057b47f0c00473fb13f43 (diff) | |
| parent | 3cb911a52f4a8e4e1aa69f4023b6a8cc1ebf21cb (diff) | |
| download | vaultwarden-f84cbeaaf8409ded400bcd12e6ea15f33bc1d065.tar.gz vaultwarden-f84cbeaaf8409ded400bcd12e6ea15f33bc1d065.zip | |
Merge branch 'master' into rocket-0.4
# Conflicts:
# src/db/models/organization.rs
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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" |