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/public_timelines/show.html.haml
+++ b/app/views/public_timelines/show.html.haml
@ -13,4 +13,4 @@
    %p= t('about.browse_local_posts', title: site_title)

 #mastodon-timeline{ data: { props: Oj.dump(default_props.merge(local: !Setting.show_known_fediverse_at_about_page)) }}
-#modal-container
+.notranslate#modal-container