Merge tag 'v3.4.0' into hometown-dev

2021-05-17 13:48:27 -07:00
parent 0e3f729c33 4c7efdba40
commit f57cda3855
897 changed files with 26918 additions and 14941 deletions
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@ -8,7 +8,7 @@
  = 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: site_title