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

2022-08-01 17:47:02 +02:00
parent ed039075c4 4b36e47474
commit 3a9e3c1248
112 changed files with 825 additions and 290 deletions
@@ -2124,6 +2124,14 @@
  },
  {
    "descriptors": [
+      {
+        "defaultMessage": "Follow hashtag",
+        "id": "hashtag.follow"
+      },
+      {
+        "defaultMessage": "Unfollow hashtag",
+        "id": "hashtag.unfollow"
+      },
      {
        "defaultMessage": "or {additional}",
        "id": "hashtag.column_header.tag_mode.any"
@@ -3769,4 +3777,4 @@
    ],
    "path": "app/javascript/mastodon/features/video/index.json"
  }
-]
+]