diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-01 20:24:50 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-01 20:24:50 -0500 |
| commit | eb39db7f93061c936fcb0bb24d5ba0c9a6186993 (patch) | |
| tree | e12b5f5c9fec1d698024c88cd9f3ea9fe5b249cd /Dockerfile | |
| parent | f0bb3ff53307aac7b9c64ec8a48d4ba1d2019513 (diff) | |
| parent | f890d2a766ae4c7fd8611dd4f3a15a13408f68c3 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index 438cf3ef4..299819e82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.4.3-alpine3.6 +FROM ruby:2.4.4-alpine3.6 LABEL maintainer="https://github.com/tootsuite/mastodon" \ description="Your self-hosted, globally interconnected microblogging community" |