diff options
| author | Reverite <github@reverite.sh> | 2019-11-13 20:03:31 -0500 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-11-13 20:03:31 -0500 |
| commit | 61a70e595d9ec7a6937d31b36d33063520cf1385 (patch) | |
| tree | 6d7697e892f9324a5d6f00ed933606fea25fd871 /app/views | |
| parent | 48635bf45f6402c8f82d4cb66fa42e3e5e8f30c2 (diff) | |
| parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/views')
| -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 |