Merge branch 'main' into glitch-soc/merge-upstream

2021-01-21 16:51:12 +01:00
parent 73d5b05019 7d0031a515
commit f90fa11db5
12 changed files with 84 additions and 84 deletions
--- 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