diff options
| author | ThibG <thib@sitedethib.com> | 2019-11-07 13:41:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 13:41:56 +0100 |
| commit | dd2ec970dbe39f09d3da32d6a8f524aaad68a9d6 (patch) | |
| tree | 0d3596a944cd4ddc27c8c3989f039f640730f70c /app/views/public_timelines | |
| parent | 00793a86bc52e4cb37318e42ea4ceb37a896c727 (diff) | |
| parent | f63dad52943c757489975e0c39e771b6bc96e5ba (diff) | |
Merge pull request #1242 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/public_timelines')
| -rw-r--r-- | app/views/public_timelines/show.html.haml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/public_timelines/show.html.haml b/app/views/public_timelines/show.html.haml index 591620f64..063089a7f 100644 --- a/app/views/public_timelines/show.html.haml +++ b/app/views/public_timelines/show.html.haml @@ -6,7 +6,11 @@ .page-header %h1= t('about.see_whats_happening') - %p= t('about.browse_public_posts') + + - if Setting.show_known_fediverse_at_about_page + %p= t('about.browse_public_posts') + - else + %p= t('about.browse_local_posts') #mastodon-timeline{ data: { props: Oj.dump(default_props) }} #modal-container |