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

2018-10-31 10:08:36 +01:00
parent 2b2facbbdf ba06a5f485
commit 75b48dc177
10 changed files with 41 additions and 62 deletions
--- a/package.json
+++ b/package.json
@ -2,7 +2,7 @@
  "name": "mastodon",
  "license": "AGPL-3.0-or-later",
  "engines": {
-    "node": ">=8"
+    "node": ">=8 <11"
  },
  "scripts": {
    "postversion": "git push --tags",