diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-12-26 17:03:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-26 17:03:29 -0500 |
| commit | 7347bc733418651216f22f224caf656471499a08 (patch) | |
| tree | ae9b93b06d6955258f5159dc4285e7ba2253b6f2 /app/javascript/flavours/glitch/features/community_timeline | |
| parent | e6ab869d956eb088eff6ce8b8b6114fb0d6d63fd (diff) | |
| parent | 20ad071931ef520cdae6bf683ee52d369de8314b (diff) | |
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
Merge various small vanilla updates into glitch
Diffstat (limited to 'app/javascript/flavours/glitch/features/community_timeline')
| -rw-r--r-- | app/javascript/flavours/glitch/features/community_timeline/components/column_settings.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/community_timeline/components/column_settings.js b/app/javascript/flavours/glitch/features/community_timeline/components/column_settings.js index 6dc292ee5..aad5f3976 100644 --- a/app/javascript/flavours/glitch/features/community_timeline/components/column_settings.js +++ b/app/javascript/flavours/glitch/features/community_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> ); |