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

diff --cc Gemfile
index 8a36db08d01cc0fa50317712f481dc918404ec31,7c5485e0758c28ce2223aa85a6f7065eabe93c58..0ffe566a2942986784ddae93544b2a44a5db8be1
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -102,11 -101,9 +102,11 @@@ gem 'webpacker', '~> 4.2
  gem 'webpush'
  
  gem 'json-ld'
- gem 'json-ld-preloaded', '~> 3.0'
+ gem 'json-ld-preloaded', '~> 3.1'
  gem 'rdf-normalize', '~> 0.4'
  
 +gem 'redcarpet', '~> 3.4'
 +
  group :development, :test do
    gem 'fabrication', '~> 2.21'
    gem 'fuubar', '~> 2.5'

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/accounts_controller.rb
Simple merge

diff --cc app/controllers/auth/registrations_controller.rb
Simple merge

diff --cc lib/mastodon/version.rb
Simple merge

diff --cc package.json
index df2c401759749fde4ba1d70f7dffc78427d49cff,04c05961f9b88ab2b49aeceeb483be54fa3b2a53..7cdfca004b259ae36437dfa031aacce6ec446e5d
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -68,13 -67,12 +68,13 @@@
      "@babel/preset-env": "^7.8.3",
      "@babel/preset-react": "^7.8.3",
      "@babel/runtime": "^7.8.3",
-     "@gamestdio/websocket": "^0.3.2",
      "@clusterws/cws": "^0.17.3",
+     "@gamestdio/websocket": "^0.3.2",
      "array-includes": "^3.1.1",
 +    "atrament": "^0.2.3",
      "arrow-key-navigation": "^1.1.0",
      "autoprefixer": "^9.7.4",
-     "axios": "^0.19.1",
+     "axios": "^0.19.2",
      "babel-loader": "^8.0.6",
      "babel-plugin-lodash": "^3.3.4",
      "babel-plugin-preval": "^4.0.0",

diff --cc yarn.lock
Simple merge