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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/serializers/rest/status_serializer.rb
Simple merge

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

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

diff --cc package.json
index 545c5f731a26760694ca71e814391128593da304,27ecc45a226459b870cb8a9206154d41896b5f7f..99a80b8ee63ec97412f135798a88249fe5a2bd46
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -64,17 -63,16 +64,17 @@@
      "@babel/plugin-proposal-class-properties": "^7.7.0",
      "@babel/plugin-proposal-decorators": "^7.7.0",
      "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
-     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-     "@babel/plugin-transform-react-inline-elements": "^7.2.0",
-     "@babel/plugin-transform-react-jsx-self": "^7.2.0",
+     "@babel/plugin-syntax-dynamic-import": "^7.7.4",
+     "@babel/plugin-transform-react-inline-elements": "^7.7.4",
+     "@babel/plugin-transform-react-jsx-self": "^7.7.4",
      "@babel/plugin-transform-react-jsx-source": "^7.5.0",
-     "@babel/plugin-transform-runtime": "^7.5.5",
-     "@babel/preset-env": "^7.7.1",
+     "@babel/plugin-transform-runtime": "^7.7.4",
+     "@babel/preset-env": "^7.7.4",
      "@babel/preset-react": "^7.7.0",
-     "@babel/runtime": "^7.7.2",
+     "@babel/runtime": "^7.7.4",
      "@clusterws/cws": "^0.16.0",
      "array-includes": "^3.0.3",
 +    "atrament": "^0.2.3",
      "arrow-key-navigation": "^1.0.2",
      "autoprefixer": "^9.6.1",
      "axios": "^0.19.0",

diff --cc yarn.lock
Simple merge