diff options
| author | ThibG <thib@sitedethib.com> | 2020-04-20 18:25:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 18:25:18 +0200 |
| commit | 60f8a63a76f7c866b5338c33a8b897ba022368ca (patch) | |
| tree | b816c0e92ade09712e9bcce29716e762f38769c1 /app/javascript/flavours/glitch/containers | |
| parent | d5530827c984238f93100ee737ed209d61e316c0 (diff) | |
| parent | 221ea4787fe0caf0f8a3238ab95e97aaac8fe360 (diff) | |
Merge pull request #1320 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/containers')
| -rw-r--r-- | app/javascript/flavours/glitch/containers/timeline_container.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/containers/timeline_container.js b/app/javascript/flavours/glitch/containers/timeline_container.js index 6ce556664..b61dc8dd7 100644 --- a/app/javascript/flavours/glitch/containers/timeline_container.js +++ b/app/javascript/flavours/glitch/containers/timeline_container.js @@ -38,7 +38,7 @@ export default class TimelineContainer extends React.PureComponent { let timeline; if (hashtag) { - timeline = <HashtagTimeline hashtag={hashtag} />; + timeline = <HashtagTimeline hashtag={hashtag} local={local} />; } else { timeline = <PublicTimeline local={local} />; } |