Merge tag 'v3.1.4' into hometown-dev

2020-05-15 15:34:04 -07:00
parent 1d70261350 c9dcc2d39f
commit 877a478466
1182 changed files with 15087 additions and 6745 deletions
--- a/app/views/public_timelines/show.html.haml
+++ b/app/views/public_timelines/show.html.haml
@ -12,5 +12,5 @@
  - else
    %p= t('about.browse_local_posts', title: site_title)

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