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

2022-03-14 16:44:35 +01:00
parent 988f5bf026 91616004fe
commit a945182b56
71 changed files with 165 additions and 68 deletions
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -298,6 +298,7 @@
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Blocked domains",
  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
  "navigation_bar.favourites": "Favourites",
  "navigation_bar.filters": "Muted words",
  "navigation_bar.follow_requests": "Follow requests",