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

Conflicts:
- `CONTRIBUTING.md`:
  Upstream file has changed and we're quoting it.
  Ported the changes.
- `README.md`:
  Upstream file has changed but we have a completely different one.
  Kept our version.
- `lib/mastodon/version.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
This commit is contained in:
Claire
2021-07-13 17:57:15 +02:00
49 changed files with 1464 additions and 1800 deletions

View File

@@ -1,5 +1,5 @@
{
"name": "@tootsuite/mastodon",
"name": "@mastodon/mastodon",
"license": "AGPL-3.0-or-later",
"engines": {
"node": ">=12"
@@ -18,7 +18,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/tootsuite/mastodon.git"
"url": "https://github.com/mastodon/mastodon.git"
},
"browserslist": [
"last 2 versions",