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

Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/api/v1/notifications_controller.rb
Simple merge

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

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

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

diff --cc package.json
index 8262c73aaebb8230d6245f9679b4414e6962670d,a603a887ee0f0de2f3a14190be54edf1ae32c36f..826a1935bfc3e2986a8ff673cad9a38e8d99810c
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -70,8 -69,8 +70,9 @@@
      "@babel/preset-env": "^7.3.4",
      "@babel/preset-react": "^7.0.0",
      "@babel/runtime": "^7.3.4",
+     "@clusterws/cws": "^0.14.0",
      "array-includes": "^3.0.3",
 +    "atrament": "^0.2.3",
      "autoprefixer": "^9.4.10",
      "axios": "^0.18.0",
      "babel-loader": "^8.0.5",

diff --cc streaming/index.js
Simple merge

diff --cc yarn.lock
Simple merge