diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-01-05 13:36:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-05 13:36:55 +0100 |
| commit | df89cb5488f4d54c71048c6ee6b2c608a0a8ab50 (patch) | |
| tree | efa4de498df46719da1342c3fc3c9a27b7bd77ed /app/assets/javascripts/components/containers/mastodon.jsx | |
| parent | 92638308eeb8d75afbeccb77c22013bd1af75ee0 (diff) | |
| parent | 05cc5636d8d56f95e1428408f6fce87ffb7c1a42 (diff) | |
Merge pull request #399 from ticky/public-timeline-de-hoist
Public timeline de-hoist
Diffstat (limited to 'app/assets/javascripts/components/containers/mastodon.jsx')
| -rw-r--r-- | app/assets/javascripts/components/containers/mastodon.jsx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx index 670455376..026daeb06 100644 --- a/app/assets/javascripts/components/containers/mastodon.jsx +++ b/app/assets/javascripts/components/containers/mastodon.jsx @@ -16,6 +16,7 @@ import { useRouterHistory, Router, Route, + IndexRedirect, IndexRoute } from 'react-router'; import { useScroll } from 'react-router-scroll'; @@ -107,8 +108,9 @@ const Mastodon = React.createClass({ <Provider store={store}> <Router history={browserHistory} render={applyRouterMiddleware(useScroll())}> <Route path='/' component={UI}> - <IndexRoute component={GettingStarted} /> + <IndexRedirect to="/getting_started" /> + <Route path='getting_started' component={GettingStarted} /> <Route path='timelines/home' component={HomeTimeline} /> <Route path='timelines/mentions' component={MentionsTimeline} /> <Route path='timelines/public' component={PublicTimeline} /> |