diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-04-22 19:13:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-22 19:13:02 +0200 |
| commit | 2ebbfebfe9c7c967e3bcc9da0eec4628f9188233 (patch) | |
| tree | ed3fa3f23d520e99fdd8b19597992b59a47aaa7d /app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx | |
| parent | f30c5e7f15f967019245d2c78f3c2e89800eb838 (diff) | |
| parent | 9ef32ea570fd0db63bd75714cd847abad6833345 (diff) | |
Merge pull request #2192 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx')
| -rw-r--r-- | app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx index 63a331086..06984f3ad 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx +++ b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx @@ -203,7 +203,7 @@ class Conversation extends ImmutablePureComponent { parseClick={this.parseClick} expanded={isExpanded} onExpandedToggle={this.handleShowMore} - collapsable + collapsible media={media} /> |