Merge branch 'instance_only_statuses' of https://github.com/masto-donte-com-br/mastodon into hometown-dev

This commit is contained in:
Darius Kazemi
2020-03-02 09:52:41 -08:00
1433 changed files with 34473 additions and 9858 deletions

View File

@ -7,7 +7,10 @@
.page-header
%h1= t('about.see_whats_happening')
%p= t('about.browse_public_posts', title: site_title)
- if Setting.show_known_fediverse_at_about_page
%p= t('about.browse_public_posts', title: site_title)
- else
%p= t('about.browse_local_posts', title: site_title)
#mastodon-timeline{ data: { props: Oj.dump(default_props) }}
#modal-container