Merge branch 'master' into glitch-soc/merge-upstream

2018-10-23 17:15:57 +02:00
parent 0c7f710be1 65867b6e61
commit 8f3096b846
12 changed files with 158 additions and 23 deletions
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 FROM node:8.12.0-alpine as node
-FROM ruby:2.4.4-alpine3.7
+FROM ruby:2.4.5-alpine3.8

 LABEL maintainer="https://github.com/tootsuite/mastodon" \
      description="Your self-hosted, globally interconnected microblogging community"