Merge branch 'instance_only_statuses' of https://github.com/masto-donte-com-br/mastodon into hometown-dev

2020-03-02 09:52:41 -08:00
parent d4ba877266 e0f3a4583c
commit 7977ce6d5e
1433 changed files with 34473 additions and 9858 deletions
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@ -115,6 +115,7 @@ class AccountTimeline extends ImmutablePureComponent {
          shouldUpdateScroll={shouldUpdateScroll}
          emptyMessage={emptyMessage}
          bindToDocument={!multiColumn}
+          timelineId='account'
        />
      </Column>
    );