diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-12-27 16:46:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-27 16:46:38 +0100 |
| commit | e2933854ac598c5ee7428a654a72cf4f4bd9afea (patch) | |
| tree | b477529aea467279c73b35c87124d7355861646a /app/javascript/flavours/glitch/features | |
| parent | 3b9a6049adf3ee6844a81622c297dd893836f79d (diff) | |
| parent | f011787003bcb801b487ad3f5229e324a37c9e1d (diff) | |
Merge pull request #1653 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features')
| -rw-r--r-- | app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js index de1127b0d..142118cef 100644 --- a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js +++ b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js @@ -33,8 +33,8 @@ class ColumnSettings extends React.PureComponent { tags (mode) { let tags = this.props.settings.getIn(['tags', mode]) || []; - if (tags.toJSON) { - return tags.toJSON(); + if (tags.toJS) { + return tags.toJS(); } else { return tags; } |