diff options
| author | Anthony Bellew <anthonyreflected@gmail.com> | 2017-01-03 11:51:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 11:51:35 -0700 |
| commit | de154dbd5dbb04d083f5a66dc288d9fef7006c01 (patch) | |
| tree | 88a1715021c33add55501351dbf74950deeac481 /app/assets/javascripts/components/features/hashtag_timeline/index.jsx | |
| parent | c3e9ba6a66bfcb9e33edebc73adea0a17d7f02a6 (diff) | |
| parent | e6657d7342ee1ce08973bf1e5ab89e423eb8b760 (diff) | |
Merge pull request #1 from Gargron/master
Catchup merge
Diffstat (limited to 'app/assets/javascripts/components/features/hashtag_timeline/index.jsx')
| -rw-r--r-- | app/assets/javascripts/components/features/hashtag_timeline/index.jsx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/components/features/hashtag_timeline/index.jsx b/app/assets/javascripts/components/features/hashtag_timeline/index.jsx index cf53a7729..f28e01a00 100644 --- a/app/assets/javascripts/components/features/hashtag_timeline/index.jsx +++ b/app/assets/javascripts/components/features/hashtag_timeline/index.jsx @@ -7,6 +7,7 @@ import { updateTimeline, deleteFromTimelines } from '../../actions/timelines'; +import ColumnBackButton from '../public_timeline/components/column_back_button'; const HashtagTimeline = React.createClass({ @@ -68,6 +69,7 @@ const HashtagTimeline = React.createClass({ return ( <Column icon='hashtag' heading={id}> + <ColumnBackButton /> <StatusListContainer type='tag' id={id} /> </Column> ); |