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

Conflicts: - `package.json`
2019-11-06 14:38:28 +01:00
parent 00793a86bc 42d9ca21de
commit 0ae7d84273
31 changed files with 492 additions and 312 deletions
--- 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