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 
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
This commit is contained in:
Thibaut Girka
2018-10-05 15:23:57 +02:00
parent a9e8f98a9d 028ad4124c
commit 00fcdebed7
93 changed files with 406 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -1,5 +1,5 @@
FROM node:8.11.3-alpine as node
FROM ruby:2.4.4-alpine3.6
FROM node:8.12.0-alpine as node
FROM ruby:2.4.4-alpine3.7
LABEL maintainer="https://github.com/tootsuite/mastodon" \
description="Your self-hosted, globally interconnected microblogging community"