Merge tag 'v3.1.4' into hometown-dev

2020-05-15 15:34:04 -07:00
parent 1d70261350 c9dcc2d39f
commit 877a478466
1182 changed files with 15087 additions and 6745 deletions
--- a/app/javascript/mastodon/features/reblogs/index.js
+++ b/app/javascript/mastodon/features/reblogs/index.js
@ -79,7 +79,7 @@ class Reblogs extends ImmutablePureComponent {
          bindToDocument={!multiColumn}
        >
          {accountIds.map(id =>
-            <AccountContainer key={id} id={id} withNote={false} />
+            <AccountContainer key={id} id={id} withNote={false} />,
          )}
        </ScrollableList>
      </Column>