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

2022-06-10 11:51:43 +02:00
parent 3d841eba69 a2871cd747
commit edaaf6a5e9
156 changed files with 1768 additions and 156 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -3307,7 +3307,7 @@
  {
    "descriptors": [
      {
-        "defaultMessage": "Toot",
+        "defaultMessage": "Publish",
        "id": "compose_form.publish"
      }
    ],
@@ -3724,4 +3724,4 @@
    ],
    "path": "app/javascript/mastodon/features/video/index.json"
  }
-]
+]