diff options
| author | ThibG <thib@sitedethib.com> | 2020-05-03 23:29:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 23:29:41 +0200 |
| commit | 75b0fa8b760b8829b933b249ac48965abdab15ae (patch) | |
| tree | 4b2e5293f15972012c4dc876bb66870d692490d0 /app/views/public_timelines/show.html.haml | |
| parent | 9c61dadc0db7009853c6b2345a02c3b219022929 (diff) | |
| parent | 89fcd68b7501f81a3e33f6b1abff6fc66f78e04b (diff) | |
Merge pull request #1324 from ThibG/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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/public_timelines/show.html.haml b/app/views/public_timelines/show.html.haml index 063089a7f..e32bd49ec 100644 --- 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') -#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 |