diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-06-04 02:18:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-04 02:18:18 +0200 |
commit | 0deb9fa6b9b8820fcb0a9ebd221178a8ec82490a (patch) | |
tree | 8d41e4f356c41e74ea2b1d5c0b0552b058d7495a /app/javascript/mastodon/features/getting_started/index.js | |
parent | 00512ecf87e1098f5632eeec2cd116344a787523 (diff) |
Remove trending hashtags (#7711)
* Delete trends_controller.rb * Update routes.rb * Update trending_tags.rb * Update index.js * Update index.js * Update search_results.js * Update async-components.js * Update index.js * Delete trends.js * Delete trends.js * Delete trends_container.js * Delete trends.js * Update search_results.js * Update search_results_container.js
Diffstat (limited to 'app/javascript/mastodon/features/getting_started/index.js')
-rw-r--r-- | app/javascript/mastodon/features/getting_started/index.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 67a5b282a..115dfd2b9 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -12,7 +12,6 @@ import { fetchFollowRequests } from '../../actions/accounts'; import { List as ImmutableList } from 'immutable'; import { Link } from 'react-router-dom'; import NavigationBar from '../compose/components/navigation_bar'; -import TrendsContainer from './containers/trends_container'; const messages = defineMessages({ home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' }, @@ -132,8 +131,6 @@ export default class GettingStarted extends ImmutablePureComponent { {navItems} </div> - {multiColumn && <TrendsContainer />} - {!multiColumn && <div className='flex-spacer' />} <div className='getting-started getting-started__footer'> |