diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-05 19:18:11 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-05 19:18:11 +0100 |
commit | 920ba5fc4e705ea9418d2cab12e4d2ffd53775de (patch) | |
tree | 9285c8beb7c1cfb9b85f66df55ed022e4916a311 /app/assets/javascripts/components/containers/mastodon.jsx | |
parent | 77e13c2bc93fdb633f27f94989ab5770f9ecc3b3 (diff) |
Fix #61 - Add list of blocked users to the UI; clean up failed push notifications API
Try to fix Travis CI setup
Diffstat (limited to 'app/assets/javascripts/components/containers/mastodon.jsx')
-rw-r--r-- | app/assets/javascripts/components/containers/mastodon.jsx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx index 46a01b200..3b36ce3ef 100644 --- a/app/assets/javascripts/components/containers/mastodon.jsx +++ b/app/assets/javascripts/components/containers/mastodon.jsx @@ -33,6 +33,7 @@ import Notifications from '../features/notifications'; import FollowRequests from '../features/follow_requests'; import GenericNotFound from '../features/generic_not_found'; import FavouritedStatuses from '../features/favourited_statuses'; +import Blocks from '../features/blocks'; import { IntlProvider, addLocaleData } from 'react-intl'; import en from 'react-intl/locale-data/en'; import de from 'react-intl/locale-data/de'; @@ -124,6 +125,8 @@ const Mastodon = React.createClass({ <Route path='accounts/:accountId/following' component={Following} /> <Route path='follow_requests' component={FollowRequests} /> + <Route path='blocks' component={Blocks} /> + <Route path='*' component={GenericNotFound} /> </Route> </Router> |