diff options
author | ThibG <thib@sitedethib.com> | 2018-09-01 17:44:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-01 17:44:06 +0200 |
commit | 2b82829a5351855bbf8dccdb57c8f7dbd598b6bb (patch) | |
tree | b3754c8ac02614e821c6680cf31ecb64389aca36 /app/javascript | |
parent | cc7adf7e842b662fafc1eb1a9de3b7a450abbd1a (diff) | |
parent | a74a7d5fe30dad5e2e4a3ac5e199ce18db75fe59 (diff) |
Merge pull request #699 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/mastodon/features/list_timeline/index.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/mastodon/features/list_timeline/index.js b/app/javascript/mastodon/features/list_timeline/index.js index 164669e89..a655451b1 100644 --- a/app/javascript/mastodon/features/list_timeline/index.js +++ b/app/javascript/mastodon/features/list_timeline/index.js @@ -4,6 +4,7 @@ import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; import StatusListContainer from '../ui/containers/status_list_container'; import Column from '../../components/column'; +import ColumnBackButton from '../../components/column_back_button'; import ColumnHeader from '../../components/column_header'; import { addColumn, removeColumn, moveColumn } from '../../actions/columns'; import { FormattedMessage, defineMessages, injectIntl } from 'react-intl'; @@ -129,9 +130,8 @@ export default class ListTimeline extends React.PureComponent { } else if (list === false) { return ( <Column> - <div className='scrollable'> - <MissingIndicator /> - </div> + <ColumnBackButton /> + <MissingIndicator /> </Column> ); } |