From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 21 Jan 2021 15:51:12 +0000 (+0100)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f90fa11db5935521f662ce0d9c608a1037e40da8;p=mastodon.git

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

f90fa11db5935521f662ce0d9c608a1037e40da8
diff --cc app/views/home/index.html.haml
index ce47418d4,3d6283fba..568b23eff
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@@ -6,8 -6,9 +6,8 @@@
  
    %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
    = render_initial_state
 -  = javascript_pack_tag 'application', crossorigin: 'anonymous'
  
- .app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
+ .notranslate.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
    %noscript
      = image_pack_tag 'logo.svg', alt: 'Mastodon'