diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-01-21 16:51:12 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-01-21 16:51:12 +0100 |
| commit | f90fa11db5935521f662ce0d9c608a1037e40da8 (patch) | |
| tree | 9a5bb397170bb5880934f5695854865935c6e9c9 /app/views/public_timelines | |
| parent | 73d5b050196e9fdbe4c09f7d8650eed7562f2a08 (diff) | |
| parent | 7d0031a515a9ccd552fab9ad55b6edb7e0e5ba32 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views/public_timelines')
| -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 e32bd49ec..71a3d289b 100644 --- a/app/views/public_timelines/show.html.haml +++ b/app/views/public_timelines/show.html.haml @@ -13,4 +13,4 @@ %p= t('about.browse_local_posts') #mastodon-timeline{ data: { props: Oj.dump(default_props.merge(local: !Setting.show_known_fediverse_at_about_page)) }} -#modal-container +.notranslate#modal-container |