Skip to content

GitLab

Commit d25d1d7a authored by Jeffrey Phillips Freeman's avatar Jeffrey Phillips Freeman 💥
Browse files

Merge branch 'qoto-fedibird' into qoto

parents 0f728d89 c0a94a80
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
app/javascript/mastodon/features/getting_started/index.js
View file @ d25d1d7a
......@@ -13,6 +13,8 @@ import { List as ImmutableList } from 'immutable';
import NavigationContainer from '../compose/containers/navigation_container';
import Icon from 'mastodon/components/icon';
import LinkFooter from 'mastodon/features/ui/components/link_footer';
import FavouriteDomainPanel from 'mastodon/features/ui/components/favourite_domain_panel';
import FavouriteTagPanel from 'mastodon/features/ui/components/favourite_tag_panel';
import TrendsContainer from './containers/trends_container';
const messages = defineMessages({
......@@ -207,6 +209,9 @@ class GettingStarted extends ImmutablePureComponent {
{navItems}
</div>
<FavouriteDomainPanel />
<FavouriteTagPanel />
{!multiColumn && <div className='flex-spacer' />}
<LinkFooter withHotkeys={multiColumn} />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment