tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
No conflicts.
This commit is contained in:
Thibaut Girka
2019-01-19 18:28:37 +01:00
parent 530d29148c 7c3fddeab4
commit 5e0cf92fd1
57 changed files with 1103 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -1,5 +1,5 @@
FROM node:8.14.0-alpine as node
FROM ruby:2.4.5-alpine3.8
FROM node:8.15-alpine as node
FROM ruby:2.6-alpine3.8
LABEL maintainer="https://github.com/tootsuite/mastodon" \
description="Your self-hosted, globally interconnected microblogging community"