Merge remote-tracking branch 'parent/main' into upstream-20240126

2024-01-26 11:14:21 +09:00 · 2024-01-26 11:14:21 +09:00 · 3dd9591a4b
commit 3dd9591a4b
parent 32cd686080 881e8c113c
163 changed files with 3000 additions and 2777 deletions
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@ -94,7 +94,6 @@ class NavigationPanel extends Component {
      <div className='navigation-panel'>
        <div className='navigation-panel__logo'>
          <Link to='/' className='column-link column-link--logo'><WordmarkLogo /></Link>
-          {!banner && <hr />}
        </div>

        {banner &&