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

2019-03-27 14:01:19 +01:00
parent bdf4f56f9a a91acf79b5
commit 48230b57d2
2 changed files with 7 additions and 3 deletions
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -219,9 +219,9 @@ class Header extends ImmutablePureComponent {
            <div className='spacer' />

            <div className='account__header__tabs__buttons'>
-              <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
-
              {actionBtn}
+
+              <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
            </div>
          </div>