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

2021-06-03 20:47:02 +02:00
parent 02dffa8edd f6088922c0
commit 0157caacef
498 changed files with 1454 additions and 551 deletions
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@ -146,7 +146,7 @@
  "emoji_button.food": "Food & Drink",
  "emoji_button.label": "Insert emoji",
  "emoji_button.nature": "Nature",
-  "emoji_button.not_found": "No emojos!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "No matching emojis found",
  "emoji_button.objects": "Objects",
  "emoji_button.people": "People",
  "emoji_button.recent": "Frequently used",