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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc config/locales/ja.yml
Simple merge

diff --cc config/locales/simple_form.ja.yml
Simple merge

diff --cc package.json
index 826a1935bfc3e2986a8ff673cad9a38e8d99810c,50cc6e159dab2eb4b37f44b5612eca61b1de658b..53fe77899f6aceb3133b021db70973118b9e6fee
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -93,8 -91,7 +93,8 @@@
      "es6-symbol": "^3.1.1",
      "escape-html": "^1.0.3",
      "exif-js": "^2.3.0",
-     "express": "^4.16.4",
+     "express": "^4.17.1",
 +    "favico.js": "^0.3.10",
      "fibers": "^3.1.1",
      "file-loader": "^3.0.1",
      "font-awesome": "^4.7.0",

diff --cc yarn.lock
Simple merge