diff options
author | reverite <samantha@chalker.io> | 2019-01-29 21:12:50 -0800 |
---|---|---|
committer | reverite <samantha@chalker.io> | 2019-01-29 21:12:50 -0800 |
commit | c2ccdad102cae9bc3dc94d1d6c6f306ca0366370 (patch) | |
tree | 85bac2a16c9c2371679d43311d9d6b069c988e94 /app/javascript/flavours/glitch/features/direct_timeline/components | |
parent | 50dc62ea3a36039463032aa2e712471859d9d9b6 (diff) | |
parent | 48d00ac0d9ad703fa3605337b0866c8ce6f21b28 (diff) |
Merge branch 'glitch'
Diffstat (limited to 'app/javascript/flavours/glitch/features/direct_timeline/components')
-rw-r--r-- | app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js b/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js index a992b27bb..5adb44f2c 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js +++ b/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js @@ -26,7 +26,7 @@ export default class ColumnSettings extends React.PureComponent { <span className='column-settings__section'><FormattedMessage id='home.column_settings.advanced' defaultMessage='Advanced' /></span> <div className='column-settings__row'> - <SettingText settings={settings} settingKey={['regex', 'body']} onChange={onChange} label={intl.formatMessage(messages.filter_regex)} /> + <SettingText settings={settings} settingPath={['regex', 'body']} onChange={onChange} label={intl.formatMessage(messages.filter_regex)} /> </div> </div> ); |