diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-31 18:25:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-31 18:25:34 +0100 |
| commit | 968f34300681d8082cf2f824722a3945fc604b2d (patch) | |
| tree | 910675cc3b8d9022f65bcfa9bee1acee6af8d0e4 /app/views/public_timelines/show.html.haml | |
| parent | 371563b0e249b6369e04709fb974a8e57413529f (diff) | |
| parent | 1fe4e5e38c17a726e6aea5d6033139653e89a379 (diff) | |
Merge pull request #1876 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/public_timelines/show.html.haml')
| -rw-r--r-- | app/views/public_timelines/show.html.haml | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/app/views/public_timelines/show.html.haml b/app/views/public_timelines/show.html.haml deleted file mode 100644 index 71a3d289b..000000000 --- a/app/views/public_timelines/show.html.haml +++ /dev/null @@ -1,16 +0,0 @@ -- content_for :page_title do - = t('about.see_whats_happening') - -- content_for :header_tags do - %meta{ name: 'robots', content: 'noindex' }/ - -.page-header - %h1= t('about.see_whats_happening') - - - 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.merge(local: !Setting.show_known_fediverse_at_about_page)) }} -.notranslate#modal-container |