Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-25 20:17:10 +00:00
parent f77c47d01b 1e5d1fa5c8
commit bed13f22e2
4 changed files with 60 additions and 4 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,9 @@
 {
  "name": "mastodon",
  "license": "AGPL-3.0",
+  "engines": {
+    "node": ">=6"
+  },
  "scripts": {
    "postversion": "git push --tags",
    "build:development": "cross-env RAILS_ENV=development ./bin/webpack",