From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 23 May 2019 17:01:30 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c0dc247bcee9080989d5e5354e54f9d320be1f13;p=mastodon.git

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`.
---

c0dc247bcee9080989d5e5354e54f9d320be1f13
diff --cc package.json
index 8262c73aa,a603a887e..826a1935b
--- a/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",