Merge tag 'v3.0.1' into hometown-dev

2019-11-07 10:11:39 -08:00
parent b2b108a09a c4118ba71b
commit 4f18400f90
194 changed files with 2509 additions and 1408 deletions
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@ -83,6 +83,7 @@ class AccountTimeline extends ImmutablePureComponent {
    if (!isAccount) {
      return (
        <Column>
+          <ColumnBackButton multiColumn={multiColumn} />
          <MissingIndicator />
        </Column>
      );