merged tootsuite pr #5750 into glitch flavour

This commit is contained in:
cwm
2017-12-08 19:40:49 -06:00
parent 776867ea73
commit f44c8fd130
15 changed files with 1008 additions and 2 deletions

View File

@@ -35,6 +35,7 @@ import {
FollowRequests,
GenericNotFound,
FavouritedStatuses,
ListTimeline,
Blocks,
Mutes,
PinnedStatuses,
@@ -407,7 +408,7 @@ export default class UI extends React.Component {
<WrappedRoute path='/timelines/public/local' component={CommunityTimeline} content={children} />
<WrappedRoute path='/timelines/direct' component={DirectTimeline} content={children} />
<WrappedRoute path='/timelines/tag/:id' component={HashtagTimeline} content={children} />
<WrappedRoute path='/timelines/list/:id' component={ListTimeline} content={children} />
<WrappedRoute path='/notifications' component={Notifications} content={children} />
<WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />
<WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />